lilei 8 months ago
parent
commit
f1c71bd93a

+ 12 - 1
src/views/expenseManagement/expenseReimbursement/employee.js

@@ -29,6 +29,10 @@ const Employee = {
       type: String,
       default: '请选择申请人(输入名称搜索)'
     },
+    notInSn:{
+      type: Array,
+      default: () => []
+    }
   },
   data() {
     return {
@@ -43,6 +47,12 @@ const Employee = {
     value(newValue, oldValue) {
       this.defaultVal = newValue
     },
+    notInSn(a,b){
+      console.log(a,b)
+      if(JSON.stringify(a) !== JSON.stringify(b)){
+        this.getList()
+      }
+    }
   },
   methods: {
     filterOption (input, option) {
@@ -57,7 +67,8 @@ const Employee = {
       this.$emit('input', value);
     },
     getList () {
-      this.list = this.$store.state.app.employeeList
+      console.log(11)
+      this.list = this.$store.state.app.employeeList.filter(item => this.notInSn.indexOf(item.employeeSn)<0)
       if(this.list.length==0){
         employeeQueryList({}).then(res => {
           if (res.status == 200) {

+ 3 - 3
src/views/expenseManagement/expenseReimbursement/epenseCdfModal.vue

@@ -81,11 +81,11 @@
                 v-for="(item,idx) in record.childDetailSplitList"
                 :id="item.id"
                 :key="item.id">
-                <employee style="width: 40%;" placeholder="请选择承担人员" v-model="item.splitObjSn"></employee>
+                <employee style="width: 50%;" placeholder="请选择承担人员" :notInSn="record.childDetailSplitList.filter(a=>a.splitObjSn!=item.splitObjSn).map(b=>b.splitObjSn)" v-model="item.splitObjSn"></employee>
                 -
                 <a-input-number
                   :id="'cdfTable-childsplitAmount-'+index"
-                  style="width: 40%;"
+                  style="width: 30%;"
                   v-model="item.splitAmount"
                   :precision="2"
                   :min="0"
@@ -100,7 +100,7 @@
                     size="small"
                     type="danger"
                     shape="circle"
-                    icon="delete" />
+                    icon="minus" />
                 </div>
                 <div v-if="record.childDetailSplitList&&idx == record.childDetailSplitList.length - 1">
                   <a-button

+ 6 - 0
src/views/productManagement/productPricing/editModal.vue

@@ -151,6 +151,12 @@ export default {
         ],
         afterSpecialPrice: [
           { required: true, message: '请输入特约价', trigger: 'blur' }
+        ],
+        afterTerminalPrice: [
+          { required: true, message: '请输入终端价', trigger: 'blur' }
+        ],
+        afterCarOwnersPrice: [
+          { required: true, message: '请输入车主价', trigger: 'blur' }
         ]
       },
       detailData: null //  数据详情