yusheng hai 10 meses
pai
achega
8872da72f3

+ 1 - 0
src/views/saleManage/businessOpportunity/components/darwerComponents/followList.vue

@@ -8,6 +8,7 @@
     height="calc(100vh - 350px)"
     class="dict-table"
     @cell-click="cellClick"
+    :initLoad="false"
   >
     <!-- 表头工具栏 -->
     <template v-slot:toolbar>

+ 7 - 19
src/views/saleManage/businessOpportunity/components/drawer.vue

@@ -64,6 +64,7 @@
             :isDrawer="true"
             ref="personnelAddTable"
             @save="save"
+            @getContactId="getContactId"
           ></personnelAddTable>
         </el-tab-pane>
 
@@ -146,16 +147,14 @@
         activeName: '详细信息',
         row: { contactId: '' },
         content: '',
-        cacheKeyUrl:"eos-businessOpportunity-inventoryTableDetails"
-
+        cacheKeyUrl: 'eos-businessOpportunity-inventoryTableDetails'
       };
     },
     created() {},
 
     methods: {
       async open(row) {
-        this.activeName= '详细信息',
-        this.row = await getDetail(row.id);
+        (this.activeName = '详细信息'), (this.row = await getDetail(row.id));
         this.drawer = true;
         this.$nextTick(() => {
           this.$refs.opportunityInfoRef.init(this.row);
@@ -176,15 +175,6 @@
       },
       getValidate() {
         return Promise.all([
-          new Promise((resolve, reject) => {
-            this.$refs.inventoryTable.validateForm((valid) => {
-              if (!valid) {
-                reject(false);
-              } else {
-                resolve(true);
-              }
-            });
-          }),
           new Promise((resolve, reject) => {
             this.$refs.businessAddTable.validateForm((valid) => {
               if (!valid) {
@@ -214,15 +204,11 @@
           await this.getValidate();
           this.loading = true;
 
-          if (this.$refs.inventoryTable.getTableValue().length == 0) {
-            this.$message.warning('物品清单不能为空');
-            return;
-          }
           const commitData = {
             opportunity: this.row,
             competAnalysisList: this.$refs.businessAddTable.getTableValue(),
             partyList: this.$refs.personnelAddTable.getTableValue(),
-            productList: this.$refs.inventoryTable.getTableValue()
+            productList: this.row.productList
           };
 
           UpdateInformation(commitData)
@@ -238,7 +224,9 @@
           // 表单验证未通过,不执行保存操作
         }
       },
-
+      getContactId(fn) {
+        fn(this.row.contactId);
+      },
       handleClose(done) {
         this.$confirm('确认关闭?')
           .then((_) => {

+ 2 - 2
src/views/saleManage/contact/components/darwerComponents/linkInfo.vue

@@ -268,8 +268,8 @@ export default {
         phone: '',
         email: '',
         post: '',
-        status: '',
-        ifChief: 0,
+        status: '1',
+          ifChief: 0,
         remark: ''
       });
     },

+ 2 - 3
src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -309,7 +309,6 @@
         <el-form-item
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.saleUnitId'"
-  
         >
           <el-select
             v-model="scope.row.saleUnitId"
@@ -640,6 +639,7 @@
             prop: 'saleCount',
             label: '数量',
             slot: 'saleCount',
+            headerSlot: 'headerTotalCount',
             align: 'center'
           },
           {
@@ -647,7 +647,6 @@
             prop: 'saleUnit',
             label: '单位',
             slot: 'saleUnit',
-            headerSlot: 'headerTotalCount',
             align: 'center'
           },
           {
@@ -921,7 +920,7 @@
       packingChange(item, index) {
         this.$set(
           this.form.datasource[index],
-           'saleUnitId',
+          'saleUnitId',
           item.conversionUnit
         );
       },