chris 1 éve
szülő
commit
6b3814843a

+ 11 - 4
src/views/modules/cus/contract-add-or-update.vue

@@ -84,9 +84,16 @@
           </el-col>
         </el-row>
         <el-row class="my-row">
-          <el-form-item label="备注说明">
+          <el-col :span="8">
+            <el-form-item label="合同号" prop="contractCode">
+              <el-input v-model="dataForm.contractCode" placeholder="合同号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="备注说明">
               <el-input v-model="dataForm.notes" :disabled="display" placeholder="备注说明"></el-input>
             </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row class="my-row my-bg">
@@ -172,9 +179,9 @@
           </div>
         </el-row>
 
-        <el-row class="my-row">
-          <upload-component :display="true" :title="'沟通信息表附件'" :accept="'*'" :file-obj-list="fileList1"/>
-        </el-row>
+<!--        <el-row class="my-row">-->
+<!--          <upload-component :display="true" :title="'沟通信息表附件'" :accept="'*'" :file-obj-list="fileList1"/>-->
+<!--        </el-row>-->
         <el-row class="my-row">
           <upload-component :display="display" :title="'合同评审表'" :accept="'*'" :file-obj-list="fileList" @uploadSuccess="uploadSuccess"/>
         </el-row>

+ 13 - 10
src/views/modules/cus/contract-detail.vue

@@ -33,7 +33,8 @@
         <e-desc-item label="沟通编码">{{dataForm.coCode}}</e-desc-item>
         <e-desc-item label="评审类别">{{dataForm.reTypeValue}}</e-desc-item>
         <e-desc-item label="客户名称">{{dataForm.customerName}}</e-desc-item>
-        <e-desc-item label="联系人" span="2">{{dataForm.bizManagerName}}</e-desc-item>
+        <e-desc-item label="联系人">{{dataForm.bizManagerName}}</e-desc-item>
+        <e-desc-item label="合同号">{{dataForm.contractCode}}</e-desc-item>
         <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
         <e-desc-item label="与物料有关要求的明确性、符合性" span="3">
           1、顾客对物料的要求与潜在要求是否明确 -- {{ dataForm.part11 ? '是' : '否' }}
@@ -59,9 +60,9 @@
           采取措施: {{ dataForm.takeStep || '无' }}
         </e-desc-item>
       </e-desc>
-      <e-desc title="沟通信息表附件">
-        <upload-component :display="true" :display-title="false" :accept="'*'" :file-obj-list="fileList1"/>
-      </e-desc>
+<!--      <e-desc title="沟通信息表附件">-->
+<!--        <upload-component :display="true" :display-title="false" :accept="'*'" :file-obj-list="fileList1"/>-->
+<!--      </e-desc>-->
       <e-desc title="合同评审表">
         <upload-component :display="true" :display-title="false" :accept="'*'" :file-obj-list="fileList"/>
       </e-desc>
@@ -134,13 +135,15 @@
             })
             // 沟通信息表附件显示
             this.fileList1 = []
-            data.data.communicationAttachList.forEach((item) => {
-              this.fileList1.push({
-                name: item.fileName,
-                url: item.url,
-                id: item.url
+            if (data.data.communicationAttachList) {
+              data.data.communicationAttachList.forEach((item) => {
+                this.fileList1.push({
+                  name: item.fileName,
+                  url: item.url,
+                  id: item.url
+                })
               })
-            })
+            }
             // 初始化审批Form
             this.showApproveForm(businessType, this.id)
           }

+ 8 - 0
src/views/modules/cus/contract.vue

@@ -65,6 +65,14 @@
           align="center"
           label="类别">
         </el-table-column>
+        <el-table-column
+          prop="contractCode"
+          header-align="center"
+          align="center"
+          width="140"
+          :show-tooltip-when-overflow="true"
+          label="合同号">
+        </el-table-column>
         <el-table-column
           prop="createTime"
           header-align="center"