嘉实

src/views/contractManage/contractBook/components/searchContract.vue

@@ -3,155 +3,157 @@
   <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 <script>
-import { reviewStatusSelect } from '@/enum/dict';
-export default {
-  data() {
-    return {};
-  },
-  computed: {
-    // 表格列配置
-    seekList() {
-      return [
-        {
-          label: '关键字：',
-          value: 'searchName',
-          width: 300,
-          type: 'input',
-          placeholder: '合同名称/甲方名称/版本号/编码'
-        },
-        {
-          label: '合同名称：',
-          value: 'contractName',
-          width: 300,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        {
-          label: '合同分类：',
-          value: 'categoryName',
-          width: 300,
-          type: 'select',
-          placeholder: '请选择状态',
-          planList: []
-        },
-        {
-          label: '版本号：',
-          value: 'dversion',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入',
-        },
-        {
-          label: '产品名称：',
-          value: 'productNames',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        {
-          label: '甲方名称：',
-          value: 'partaName',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        {
-          label: '乙方名称：',
-          value: 'partbName',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        {
-          label: '编码：',
-          value: 'contractNo',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        {
-          label: '合同编号：',
-          value: 'contractNumber',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        {
-          label: '是否可用：',
-          value: 'enabled',
-          width: 380,
-          type: 'select',
-          placeholder: '请选择状态',
-          planList: []
-        },
-        {
-          label: '签订日期：',
-          value: 'contractStartDate',
-          type: 'date',
-          dateType: 'datetimerange',
-          placeholder: '',
-          width: 380,
-          valueAr: ['createTimeStart', 'createTimeEnd']
-        },
-        {
-          label: '结束日期：',
-          value: 'contractEndDate',
-          type: 'date',
-          dateType: 'datetimerange',
-          placeholder: '',
-          width: 380,
-          valueAr: ['createTimeStart', 'createTimeEnd']
-        },
-        {
-          label: '收付款类型：',
-          value: 'receiptPaymentType',
-          width: 370,
-          labelWidth: 130,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        {
-          label: '合同总金额：',
-          value: 'totalPrice',
-          width: 370,
-          labelWidth: 130,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        {
-          label: '审核状态：',
-          value: 'status',
-          width: 380,
-          type: 'select',
-          placeholder: '请选择状态',
-          planList: reviewStatusSelect
-        },
-        {
-          label: '创建人：',
-          value: 'createUsername',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        {
-          label: '创建时间：',
-          value: 'createTime',
-          type: 'date',
-          dateType: 'datetimerange',
-          placeholder: '',
-          width: 380,
-          valueAr: ['createTimeStart', 'createTimeEnd']
-        },
-      ];
+  import { reviewStatusSelect } from '@/enum/dict';
+  export default {
+    data() {
+      return {};
+    },
+
+    computed: {
+      // 表格列配置
+      seekList() {
+        return [
+          {
+            label: '关键字：',
+            value: 'searchName',
+            width: 300,
+            type: 'input',
+            placeholder: '合同名称/甲方名称/版本号/编码'
+          },
+          {
+            label: '合同名称：',
+            value: 'contractName',
+            width: 300,
+            type: 'input',
+            placeholder: '请输入',
+          },
+          // {
+          //   label: '合同分类：',
+          //   value: 'categoryName',
+          //   width: 300,
+          //   type: 'select',
+          //   placeholder: '请选择状态',
+          //   show:contactData.id?false:true,
+          //   planList: []
+          // },
+          {
+            label: '版本号：',
+            value: 'dversion',
+            width: 380,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '产品名称：',
+            value: 'productNames',
+            width: 380,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '甲方名称：',
+            value: 'partaName',
+            width: 380,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '乙方名称：',
+            value: 'partbName',
+            width: 380,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '编码：',
+            value: 'contractNo',
+            width: 380,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '合同编号：',
+            value: 'contractNumber',
+            width: 380,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '是否可用：',
+            value: 'enabled',
+            width: 380,
+            type: 'select',
+            placeholder: '请选择状态',
+            planList: []
+          },
+          {
+            label: '签订日期：',
+            value: 'contractStartDate',
+            type: 'date',
+            dateType: 'datetimerange',
+            placeholder: '',
+            width: 380,
+            valueAr: ['createTimeStart', 'createTimeEnd']
+          },
+          {
+            label: '结束日期：',
+            value: 'contractEndDate',
+            type: 'date',
+            dateType: 'datetimerange',
+            placeholder: '',
+            width: 380,
+            valueAr: ['createTimeStart', 'createTimeEnd']
+          },
+          {
+            label: '收付款类型：',
+            value: 'receiptPaymentType',
+            width: 370,
+            labelWidth: 130,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '合同总金额：',
+            value: 'totalPrice',
+            width: 370,
+            labelWidth: 130,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '审核状态：',
+            value: 'status',
+            width: 380,
+            type: 'select',
+            placeholder: '请选择状态',
+            planList: reviewStatusSelect
+          },
+          {
+            label: '创建人：',
+            value: 'createUsername',
+            width: 380,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '创建时间：',
+            value: 'createTime',
+            type: 'date',
+            dateType: 'datetimerange',
+            placeholder: '',
+            width: 380,
+            valueAr: ['createTimeStart', 'createTimeEnd']
+          }
+        ];
+      }
+    },
+    methods: {
+      /* 搜索 */
+      search(e) {
+        this.$emit('search', {
+          ...e
+        });
+      }
     }
-  },
-  methods: {
-    /* 搜索 */
-    search(e) {
-      this.$emit('search', {
-        ...e
-      });
-    }
-  }
-};
+  };
 </script>

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

@@ -6,7 +6,6 @@
       :datasource="list"
       height="calc(100vh - 350px)"
       class="dict-table"
-      @cell-click="cellClick"
       :need-page="false"
     >
       <!-- 表头工具栏 -->

src/views/saleManage/contact/components/drawer.vue

@@ -6,12 +6,12 @@
     size="100%"
   >
     <div slot="title" class="title">
-      <span style="margin: 0" class="name">客户名称：{{ row.base.name }}</span>
-      <span>客户编码：{{ row.base.code }}</span>
-      <span>客户代号：{{ row.base.serialNo }}</span>
-      <span>业务员：{{ row.base.salesmanName }}</span>
+      <span style="margin: 0" class="name">客户名称：{{ row?.base?.name }}</span>
+      <span>客户编码：{{ row?.base?.code }}</span>
+      <span>客户代号：{{ row?.base?.serialNo }}</span>
+      <span>业务员：{{ row?.base?.salesmanName }}</span>
       <span
-        >客户级别：{{ getDictValue('供应商级别', row.base.level + '') }}</span
+        >客户级别：{{ getDictValue('供应商级别', row?.base?.level + '') }}</span
       >
     </div>
 
@@ -61,56 +61,62 @@
           ></el-tab-pane>
           <el-tab-pane label="商机" name="商机">
             <businessOpportunity
-              :key="row.base.id"
-              :contactId="row.base.id"
-              :contactName="row.base.name"
+              :key="row?.base?.id"
+              :contactId="row?.base?.id"
+              :contactName="row?.base?.name"
             ></businessOpportunity>
           </el-tab-pane>
 
           <el-tab-pane label="报价单" name="报价单">
-            <quotation :key="row.base.id" :contactData="row.base"></quotation>
+            <quotation :key="row?.base?.id" :contactData="row.base"></quotation>
           </el-tab-pane>
 
           <el-tab-pane label="销售订单" name="销售订单">
-            <saleOrder :key="row.base.id" :contactData="row.base"></saleOrder>
+            <saleOrder :key="row?.base?.id" :contactData="row.base"></saleOrder>
           </el-tab-pane>
 
           <el-tab-pane label="销售合同" name="销售合同">
             <contractBook
-              :key="row.base.id"
+              :key="row?.base?.id"
               :contactData="row.base"
             ></contractBook>
           </el-tab-pane>
           <!-- <el-tab-pane label="回款" name="回款"> </el-tab-pane> -->
           <el-tab-pane label="发货单" name="发货单"
-            ><invoice :key="row.base.id" :contactData="row.base"></invoice
-          ></el-tab-pane>
+            >
+            <invoice :key="row?.base?.id" :contactData="row.base"></invoice
+          >
+        </el-tab-pane>
           <el-tab-pane label="退货单" name="退货单"
-            ><returnGoods
-              :key="row.base.id"
+            >
+            <returnGoods
+              :key="row?.base?.id"
               :contactData="row.base"
             ></returnGoods
-          ></el-tab-pane>
+          >
+        </el-tab-pane>
           <el-tab-pane label="对账单" name="对账单">
             <accountstatement
-              :key="row.base.id"
+              :key="row?.base?.id"
               :contactData="row.base"
             ></accountstatement>
           </el-tab-pane>
-          <!-- <invoiceManage :key="row.base.id"></invoiceManage> -->
+          <invoiceManage :key="row.base.id"></invoiceManage>
 
           <el-tab-pane label="开票信息" name="开票信息">
             <invoiceManage
-              :key="row.base.id"
+              :key="row?.base?.id"
               :contactData="row.base"
             ></invoiceManage>
           </el-tab-pane>
           <el-tab-pane label="应收信息" name="应收信息"
-            ><receivableManage
-              :key="row.base.id"
+            >
+            <receivableManage
+              :key="row?.base?.id"
               :contactData="row.base"
             ></receivableManage
-          ></el-tab-pane>
+          >
+        </el-tab-pane>
           <el-tab-pane label="证书资质" name="证书资质">
             <certificateTable ref="certificateTableRef"></certificateTable>
           </el-tab-pane>
@@ -119,8 +125,8 @@
           </el-tab-pane> -->
           <el-tab-pane label="审批流程" name="审批流程">
             <bpmDetail
-              v-if="activeName === '审批流程' && row.base.processInstanceId"
-              :id="row.base.processInstanceId"
+              v-if="activeName === '审批流程' && row.base?.processInstanceId"
+              :id="row.base?.processInstanceId"
             ></bpmDetail>
           </el-tab-pane>
         </el-tabs>
@@ -140,7 +146,7 @@
           >
         </div>
         <!-- <tinymce-editor v-model="content" :init="{ height: 525 }" /> -->
-        <comment :key="row.base.id" ref="commentRef"></comment>
+        <comment :key="row.base?.id" ref="commentRef"></comment>
       </el-card>
       <ele-modal
         custom-class="ele-dialog-form long-dialog-form"
@@ -243,7 +249,7 @@ export default {
       drawer: false,
       title: '',
       activeName: '详细信息',
-      row: {},
+      row: {base:{}},
       content: '',
       commitCommentVisible: false,
       inputComment: '',
@@ -271,13 +277,12 @@ export default {
       this.contactCountData=contactCountData.data
       this.drawer = true;
       this.$nextTick(() => {
-        this.$refs.contactInfoRef.init(this.row);
-        this.$refs.bankInfoRef.init(this.row);
-        this.$refs.linkInfoREf.init(this.row);
-        // this.$refs.otherFormRef.init(this.row.other);
-        this.$refs.certificateTableRef.init(this.row.base);
-        this.$refs.followListRef.init(this.row);
-        this.$refs.commentRef.init(this.row.base);
+        // this.$refs.contactInfoRef.init(this.row);
+        // this.$refs.bankInfoRef.init(this.row);
+        // this.$refs.linkInfoREf.init(this.row);
+        // this.$refs.certificateTableRef.init(this.row.base);
+        // this.$refs.followListRef.init(this.row);
+        // this.$refs.commentRef.init(this.row.base);
       });
     },
     async commitComment() {