yusheng 10 месяцев назад
Родитель
Сommit
2d9c93df2f

+ 86 - 0
src/views/saleManage/contact/components/darwerComponents/applyList.vue

@@ -0,0 +1,86 @@
+<template>
+  <ele-pro-table
+    ref="table"
+    :columns="columns"
+    :datasource="tableList"
+    class="el-form-box"
+    :need-page="false"
+  >
+    <template v-slot:approvalStatus="{ row }">
+      <el-link type="primary" :underline="false" @click="openDetail(row)">
+        {{ reviewStatus[row.approvalStatus] }}
+      </el-link>
+    </template>
+    <ele-modal
+      :visible.sync="visible"
+      :title="title"
+      :close-on-click-modal="false"
+      width="70%"
+      :append-to-body="true"
+      :maxable="true"
+      :resizable="true"
+    >
+      <bpmDetail :id="processInstanceId" v-if="visible"></bpmDetail>
+    </ele-modal>
+  </ele-pro-table>
+</template>
+
+<script>
+  import dictMixins from '@/mixins/dictMixins';
+  import { reviewStatus } from '@/enum/dict';
+  import bpmDetail from '@/views/bpm/processInstance/detail.vue';
+
+  export default {
+    mixins: [dictMixins],
+    components: { bpmDetail },
+    props: {
+      tableList: {
+        default: () => {
+          return [];
+        },
+        type: Array
+      }
+    },
+    data() {
+      return {
+        visible: false,
+        processInstanceId: '',
+        reviewStatus,
+        columns: [
+          {
+            type: 'index',
+            width: 55,
+            align: 'center'
+          },
+          {
+            label: '客户名称',
+            prop: 'contactName',
+            align: 'center'
+          },
+          {
+            label: '申请人',
+            prop: 'applyName',
+            align: 'center'
+          },
+          {
+            label: '申请时间',
+            prop: 'createTime',
+            align: 'center'
+          },
+          {
+            label: '审核状态',
+            prop: 'approvalStatus',
+            align: 'center',
+            slot: 'approvalStatus'
+          }
+        ]
+      };
+    },
+    methods: {
+      openDetail(row) {
+        this.processInstanceId = row.processInstanceId;
+        this.visible=true
+      }
+    }
+  };
+</script>

+ 16 - 2
src/views/saleManage/contact/components/drawer.vue

@@ -125,6 +125,12 @@
               ref="certificateManagementRef"
             ></certificateManagement>
           </el-tab-pane>
+          <el-tab-pane label="申请记录" name="申请记录">
+            <applyList
+              ref="applyListRef"
+              :tableList="row.listApply"
+            ></applyList>
+          </el-tab-pane>
 
           <el-tab-pane label="审批流程" name="审批流程">
             <bpmDetail
@@ -220,6 +226,8 @@
   import receivableManage from '@/views/financialManage/receivableManage/index.vue';
   //跟进
   import followList from './darwerComponents/followList.vue';
+  //申请记录
+  import applyList from './darwerComponents/applyList.vue';
   import TinymceEditor from '@/components/TinymceEditor/index.vue';
   import { mapGetters } from 'vuex';
   import bpmDetail from '@/views/bpm/processInstance/detail.vue';
@@ -246,7 +254,8 @@
       returnGoods,
       accountstatement,
       comment,
-      certificateManagement
+      certificateManagement,
+      applyList
     },
     data() {
       return {
@@ -276,8 +285,13 @@
     methods: {
       async open(row, pageName) {
         console.log(row, pageName);
-        
+
         this.row = await contactDetail(row.id);
+        if (this.row?.listApply) {
+          this.row?.listApply.forEach((item, index) => {
+            this.$set(this.row?.listApply[index],'contactName',this.row.base.name)
+          });
+        }
         this.pageName = pageName;
         const contactCountData = await queryContactIdCount(row.id);
         this.contactCountData = contactCountData.data;

+ 12 - 6
src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

@@ -79,7 +79,12 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="车牌号" prop="carNo">
-            <el-select v-model="form.carNo" style="width: 100%">
+            <el-select
+              v-model="form.carNo"
+              style="width: 100%"
+              clearable
+              multiple
+            >
               <el-option
                 :label="item.trakNumber"
                 :value="item.trakNumber"
@@ -262,7 +267,7 @@
         receiveAddress: '',
         deviceName: '',
         deviceId: '',
-        carNo: '',
+        carNo: [],
         linkName: '',
         linkPhone: '',
         orderNo: '',
@@ -480,6 +485,7 @@
             data.productList.forEach((item) => {
               item['tempId'] = item.id;
             });
+            data.carNo=data.carNo?data.carNo.split(','):[]
             this.form = data;
             this.$refs.inventoryTableref &&
               this.$refs.inventoryTableref.putTableValue(data.productList);
@@ -500,7 +506,7 @@
       handleEntrustedReceive(e) {
         if (e.target.nodeName == 'I') {
           this.form = Object.assign({}, this.form, {
-            carNo: '',
+            carNo: [],
             deviceName: '',
             deviceId: '',
             linkName: '',
@@ -557,7 +563,7 @@
             orderNo,
             orderIds: orderId,
             productList,
-            carNo,
+            carNo: carNo ? carNo.split(',') : [],
             pricingWay,
             entrustedCode: code,
             entrustedId: id
@@ -581,7 +587,7 @@
           this.form = Object.assign({}, this.form, {
             contactId: '',
             contactName: '',
-            carNo: '',
+            carNo: [],
             deviceName: '',
             deviceId: '',
             linkName: '',
@@ -707,7 +713,7 @@
             carList: this.$refs.stowageTableRef.getTableValue(),
             trakNoteList: this.$refs.taskInfoTableRef.getTableValue()
           });
-
+          commitData.carNo = commitData.carNo.toString();
           if (this.isUpdate) {
             UpdateSendInformation(commitData)
               .then((res) => {