Эх сурвалжийг харах

Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

yusheng 10 сар өмнө
parent
commit
e72e66b946

+ 15 - 4
src/views/salesServiceManagement/components/AssetsDialog.vue

@@ -388,10 +388,10 @@
           :columns="columns"
           :datasource="tableList"
           :selection.sync="selection"
+          :page-size="20"
           v-if="isAll"
-          row-key="id"
+          row-key="code"
           height="20vh"
-          :needPage="true"
         >
           <template v-slot:toolbar>
             <el-button type="primary" size="small" @click="add">添加</el-button>
@@ -620,6 +620,8 @@
             this.handleNodeClick(data);
           });
         });
+
+        console.log(this.selection, this.tableList);
       },
       async confirm() {
         this.$emit(
@@ -634,6 +636,10 @@
           this.$message.error('请至少选择一条数据!');
           return;
         }
+        console.log(this.tableList);
+
+        console.log(this.selectionList);
+
         this.selectionList = this.selectionList.filter((item) => {
           if (item.warehouseList?.length > 0) {
             item['warehouseId'] = item.warehouseList[0].warehouse_id;
@@ -646,12 +652,17 @@
         this.tableList.push(...this.selectionList);
       },
       del() {
-        let ids = this.selection.map((item) => item.id);
+        // let ids = this.selection.map((item) => item.id);
+        // this.tableList = this.tableList.filter(
+        //   (item) => !ids.includes(item.id)
+        // );
+        let codes = this.selection.map((item) => item.code);
         this.tableList = this.tableList.filter(
-          (item) => !ids.includes(item.id)
+          (item) => !codes.includes(item.code)
         );
       },
       cancel() {
+        this.selection = [];
         this.selectionList = [];
         this.$refs.multipleTable.clearSelection();
         this.visible1 = false;

+ 3 - 3
src/views/salesServiceManagement/components/invoiceDialog.vue

@@ -359,9 +359,9 @@
         if (!this.selection.length) {
           return this.$message.warning('请至少选择一条数据');
         }
-        if (this.selection.length > 1) {
-          return this.$message.warning('只能选择一条物品明细数据');
-        }
+        // if (this.selection.length > 1) {
+        //   return this.$message.warning('只能选择一条物品明细数据');
+        // }
         this.$emit('changeParent', {
           orderCode: this.rowClickData.docNo,
           orderId: this.rowClickData.id,

+ 1 - 1
src/views/salesServiceManagement/evaluate/components/search.vue

@@ -35,7 +35,7 @@ export default {
         },
         {
           label: '工单编码:',
-          value: 'workCode',
+          value: 'workOrderCode',
           type: 'input',
           placeholder: ''
         },