Bladeren bron

返利金额

howie 3 jaren geleden
bovenliggende
commit
936519b9d9
2 gewijzigde bestanden met toevoegingen van 88 en 41 verwijderingen
  1. 70 36
      src/views/sales_policy/components/Examine.vue
  2. 18 5
      src/views/supply/policy/components/retail_form.vue

+ 70 - 36
src/views/sales_policy/components/Examine.vue

@@ -30,21 +30,27 @@
                 {{ detail.status == 1 ? "已生效" : "未生效" }}
               </div>
             </el-col>
-            <el-col :span="8" class="item">
+            <el-col :span="24" class="item">
               <div class="label">销售政策类型</div>
               <div class="value">
-                {{ detail.type == "PROVISION" ? "配提" : "限量" }}
+                <el-select
+                  v-model="detail.type"
+                  size="small"
+                  placeholder="销售政策类型"
+                  class="select_height"
+                >
+                  <el-option
+                    v-for="(item, index) in typeOptions"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+
               </div>
             </el-col>
-            <el-col :span="8" class="item">
-              <div class="label"></div>
-              <div class="value"></div>
-            </el-col>
-            <el-col :span="8" class="item">
-              <div class="label"></div>
-              <div class="value"></div>
-            </el-col>
-            <el-col :span="8" class="item">
+
+            <el-col :span="24" class="item">
               <div class="label">备注</div>
               <div class="value">
                 <el-input
@@ -53,29 +59,46 @@
                 ></el-input>
               </div>
             </el-col>
-            <el-col :span="8" class="item">
-              <div class="label"></div>
-              <div class="value"></div>
-            </el-col>
-            <el-col :span="8" class="item">
-              <div class="label"></div>
-              <div class="value"></div>
-            </el-col>
+
             <el-col :span="8" class="item">
               <div class="label">制单人</div>
               <div class="value">{{ detail.createBy }}</div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">制单日期</div>
-              <div class="value">{{ detail.createTime }}</div>
+              <div class="value">
+                <el-date-picker
+                  v-model="detail.createTime"
+                  type="datetime"
+                  placeholder="制单日期"
+                  default-time="00:00:00"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                />
+                </div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">生效日期</div>
-              <div class="value">{{ detail.startTime }}</div>
+              <div class="value">
+                <el-date-picker
+                  v-model="detail.startTime"
+                  type="datetime"
+                  placeholder="生效日期"
+                  default-time="00:00:00"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                /> </el-form-item>
+                </div>
             </el-col>
-            <el-col :span="8" class="item">
+            <el-col :span="24" class="item">
               <div class="label">失败日期</div>
-              <div class="value">{{ detail.endTime }}</div>
+              <div class="value">
+                <el-date-picker
+                  v-model="detail.endTime"
+                  type="datetime"
+                  placeholder="生效日期"
+                  default-time="00:00:00"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                /> </el-form-item>
+               </div>
             </el-col>
           </el-row>
           <el-row class="img-box" v-if="detail.imgSrc && $parent.isShow !== 5">
@@ -92,7 +115,7 @@
             </el-col>
           </el-row>
           <el-row v-if="$parent.isShow == 5">
-            <el-col :span="8" class="item">
+            <el-col :span="24" class="item">
               <div class="label" style="height: 150px">政策封面图</div>
               <div class="value" style="height: 150px">
                 <ImageUpload :fileList="fileList" :multiple="false" />
@@ -559,22 +582,21 @@
 <script>
 import {
   deleteCondition,
-  getPolicyDetail,
-  getMaterialList,
-  getCustomerList,
-  getConditionList,
   deleteMaterialPolicy,
+  getConditionList,
   getCrList,
+  getCustomerList,
+  getMaterialList,
+  getPolicyDetail,
   toExamine,
-  addPoliy,
-  updatePolicy,
-} from "@/api/policy_list";
-import EditCondition from "./EditCondition";
-import ImageUpload from "@/components/Common/image-upload.vue";
+  updatePolicy
+} from '@/api/policy_list'
+import EditCondition from './EditCondition'
+import ImageUpload from '@/components/Common/image-upload.vue'
 
-import { handleImport } from "@/utils/util";
+import { handleImport } from '@/utils/util'
 
-import Minxin from "@/mixin";
+import Minxin from '@/mixin'
 
 export default {
   mixins: [Minxin],
@@ -631,6 +653,16 @@ export default {
       importFileList: [],
       leftData: [],
       rightData: [],
+      typeOptions: [
+        {
+          value: 'PROVISION',
+          label: '配提'
+        },
+        {
+          value: 'LIMIT',
+          label: '限量'
+        }
+      ],
     };
   },
   created() {},
@@ -992,7 +1024,9 @@ export default {
   margin-right: 10px;
   display: inline-block;
 }
-
+::v-deep .el-input__icon .el-icon-time{
+  display: none;
+}
 .middle_box {
   margin-top: 80px;
   text-align: center;

+ 18 - 5
src/views/supply/policy/components/retail_form.vue

@@ -205,6 +205,7 @@
               placeholder="选择返利钱包"
               clearable
               size="small"
+              @remove-tag="clearWallet($event,scope.row)"
               @change="changeWallet($event,scope.row)"
             >
               <el-option
@@ -1666,12 +1667,24 @@ export default {
     },
     // 修改返利钱包
     changeWallet(e, row) {
-      const obj = row.rebateWallets.filter(k => {
-        return e === k.customerWalletId
-      })[0]
-      this.$set(row, 'rebateRate', (obj.rebateRate || 0))
-    },
+     if (e){
+       const obj = row.rebateWallets.filter(k => {
+         return e === k.customerWalletId
+       })[0]
+       this.$set(row, 'rebateRate', (obj.rebateRate || 0))
+     }else{
+       this.$set(row, 'rebateRate',  0)
+     }
+
 
+    },
+    clearWallet(e){
+      console.log(e)
+      // const obj = row.rebateWallets.filter(k => {
+      //   return e === k.customerWalletId
+      // })[0]
+      this.$set(row, 'rebateRate',0)
+    },
     // 检查库存
     checkStock() {
       if (!this.warehouseValue) {