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

src/views/purchasingManage/purchasePlanManage/components/dateAll.vue

@@ -0,0 +1,69 @@
+<template>
+  <el-button
+    size="small"
+    type="primary"
+    class="ele-btn-icon"
+    style="margin-left: 5px"
+    :disabled="disabled"
+    @click="show = true"
+    >批量设置到货时间
+
+    <ele-modal
+      top="25vh"
+      custom-class="ele-dialog-form long-dialog-form"
+      :visible.sync="show"
+      title="设置到货时间"
+      :close-on-click-modal="false"
+      width="500px"
+      :maxable="true"
+      :resizable="true"
+      :append-to-body="true"
+    >
+      <div>
+        到货时间：
+        <el-date-picker
+          style=""
+          clearable
+          v-model="date"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择日期"
+        >
+        </el-date-picker>
+      </div>
+      <div slot="footer" class="footer">
+        <el-button type="primary" @click="confirm">确认选择</el-button>
+        <el-button @click="show = false">返回</el-button>
+      </div>
+    </ele-modal>
+  </el-button>
+</template>
+<script>
+  export default {
+    components: {},
+    data() {
+      return {
+        show: false,
+        date: ''
+      };
+    },
+    props: {
+      disabled: {
+        default: true,
+        type: Boolean
+      }
+    },
+    created() {},
+    methods: {
+      confirm() {
+        this.$emit('success', this.date ?? '');
+        this.cancel();
+      },
+      cancel() {
+        this.show = false;
+      }
+    }
+  };
+</script>
+
+<style scoped lang="scss"></style>

src/views/purchasingManage/purchasePlanManage/components/inventoryTable.vue

@@ -28,6 +28,7 @@
             @success="warehouseAllChange"
             :disabled="!selection.length"
           ></warehouseAll>
+
           <el-button
             size="small"
             type="primary"
@@ -42,6 +43,11 @@
             @chooseTime="chooseTimeALl"
             :disabled="!selection.length"
           ></timeDialogAll>
+
+          <dateAll
+            @success="dateAllChange"
+            :disabled="!selection.length"
+          ></dateAll>
         </div>
       </template>
       <template v-slot:productName="{ row, $index }">
@@ -512,7 +518,7 @@
   import { changeCount } from '@/BIZComponents/setProduct.js';
   import { contactQueryByCategoryIdsAPI } from '@/api/saleManage/contact';
   import timeDialogAll from '@/components/timeDialog/indexAll.vue';
-
+  import dateAll from './dateAll.vue';
   export default {
     mixins: [dictMixins, tabMixins],
     props: {
@@ -537,7 +543,8 @@
       headList,
       timeDialog,
       timeDialogAll,
-      warehouseAll
+      warehouseAll,
+      dateAll
     },
     computed: {
       columns() {
@@ -1109,6 +1116,12 @@
           this.$set(this.form.datasource[key], 'warehouseId', data.id);
         });
       },
+      dateAllChange(data) {
+        let keyS = this.selection.map((item) => item.key - 1);
+        keyS.forEach((key) => {
+          this.$set(this.form.datasource[key], 'expectReceiveDate', data);
+        });
+      },
       //选择产品回调
       changeParent(obj, idx) {
         obj.forEach((item, index) => {

src/views/saleManage/contact/components/darwerComponents/followList.vue

@@ -52,6 +52,11 @@
 </template>
 
 <script>
+  import {
+    getTableList,
+    deleteInformation
+  } from '@/api/saleManage/businessFollow';
+
   import AddFollowDialog from './addFollowDialog.vue';
   import { contactUpdate } from '@/api/saleManage/contact';
 
@@ -162,7 +167,11 @@
         this.list = row.base.opportunityFollowupList;
       },
       handleBankDel(row, index) {
-        this.list.splice(index, 1);
+        console.log(row);
+        
+        // deleteInformation([row])
+
+        // this.list.splice(index, 1);
         // this.save();
       },
       done({ data, type, index }) {
@@ -185,7 +194,6 @@
               this.list = res.base.opportunityFollowupList;
             });
 
-        
             this.$emit('success');
           })
           .catch((e) => {

src/views/saleManage/followList/components/list.vue

@@ -120,7 +120,7 @@
             align: 'center'
           },
           {
-            minWidth: 200,
+            minWidth: 240,
             prop: 'contactName',
             label: '客户名称',
             align: 'center',
@@ -134,7 +134,7 @@
             showOverflowTooltip: true
           },
           {
-            minWidth: 150,
+            minWidth: 180,
             prop: 'deptName',
             label: '负责人部门',
             align: 'center',
@@ -142,7 +142,7 @@
           },
 
           {
-            minWidth: 150,
+            minWidth: 80,
             prop: 'followupCount',
             label: '跟进次数',
             align: 'center',
@@ -150,14 +150,14 @@
             showOverflowTooltip: true
           },
           {
-            minWidth: 200,
+            minWidth: 180,
             prop: 'beginTime',
             label: '开始跟进时间',
             align: 'center',
             showOverflowTooltip: true
           },
           {
-            minWidth: 200,
+            minWidth: 180,
             prop: 'lastTime',
             label: '最近一次跟进时间',
             align: 'center',

src/views/salesServiceManagement/components/invoiceDialog.vue

@@ -413,6 +413,7 @@
       },
 
       async _getInfo(sourceBizNo) {
+        console.log('zzz');
         const dataArray = await getInfoBySourceBizNoAll(sourceBizNo);
         let res = {};
         if (dataArray && dataArray.length > 0) {
@@ -438,7 +439,7 @@
                   return {
                     ...packingItem,
                     componentAttribute: productItem.componentAttribute,
-
+                    singlePrice: productItem.singlePrice,
                     categoryName: productItem.categoryName,
                     categoryCode: productItem.categoryCode,
                     productBrand: productItem.brandNum,