Bug Fix

src/views/modules/cus/contract-detail.vue

@@ -54,7 +54,7 @@
         <e-desc-item label="满足规定要求的能力" span="3">
           项目组对履行承诺的风险（包括技术、质量、生产能力、进度、经费）识别： {{ dataForm.part31 === 1 ? '高' : dataForm.part31 === 2 ? '中' : '低' }}
           <br>
-          控制能力： {{ dataForm.part31 === 1 ? '可控' : dataForm.part31 === 2 ? '基本可控' : '不可控' }}
+          控制能力： {{ dataForm.part32 === 1 ? '可控' : dataForm.part32 === 2 ? '基本可控' : '不可控' }}
           <br>
           采取措施： {{ dataForm.takeStep || '无' }}
         </e-desc-item>
@@ -123,7 +123,7 @@
               dealStepData(data.data.workFlowBusinessExt.workFlowProcessStepList, this.stepList)
               dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
             }
-            // 附件显示
+            // 合同评审表附件显示
             this.fileList = []
             data.data.attachList.forEach((item) => {
               this.fileList.push({
@@ -132,6 +132,15 @@
                 id: item.url
               })
             })
+            // 沟通信息表附件显示
+            this.fileList1 = []
+            data.data.communicationAttachList.forEach((item) => {
+              this.fileList1.push({
+                name: item.fileName,
+                url: item.url,
+                id: item.url
+              })
+            })
             // 初始化审批Form
             this.showApproveForm(businessType, this.id)
           }

src/views/modules/order/order-add-or-update.vue

@@ -67,10 +67,10 @@
             </el-form-item>
           </el-col>
         </el-row>
+<!--        <el-row class="my-row">-->
+<!--          <upload-component :display="display" :title="'合同扫描件'" :accept="'*'" :file-obj-list="fileList" @uploadSuccess="uploadSuccess"/>-->
+<!--        </el-row>-->
         <el-row class="my-row">
-          <upload-component :display="display" :title="'合同扫描件'" :accept="'*'" :file-obj-list="fileList" @uploadSuccess="uploadSuccess"/>
-        </el-row>
-        <el-row class="my-row" style="margin-top: 20px">
           <el-form-item label="备注说明" prop="notes">
             <el-input type="textarea" v-model="dataForm.notes" :disabled="display" placeholder="备注说明"></el-input>
           </el-form-item>

src/views/modules/order/order-detail.vue

@@ -34,12 +34,17 @@
         <e-desc-item label="客户名称">{{dataForm.customerName}}</e-desc-item>
 
         <e-desc-item label="业务员">{{dataForm.salesmanName}}</e-desc-item>
-        <e-desc-item label="合同交期" span="2">{{dataForm.contactDate?dataForm.contactDate.substring(0,10):''}}</e-desc-item>
+        <e-desc-item label="合同交期" span="2">{{dataForm.deliveryDate?dataForm.deliveryDate.substring(0,10):''}}</e-desc-item>
 
         <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
       </e-desc>
       <e-desc title="合同扫描件">
-        <upload-component :display="true" :display-title="false" :accept="'*'" :file-obj-list="fileList"/>
+        <e-desc-item v-if="dataForm.cusContractBookAttachList" label="附件" span="3">
+          <div v-for="(item, index) in dataForm.cusContractBookAttachList" style="display: inline">
+            <span v-if="index > 0">,</span>
+            <a :key="item.fileName + index" type="primary" href="#" @click="previewFile(item.fileName, item.url)">{{ item.fileName }}</a>
+          </div>
+        </e-desc-item>
       </e-desc>
       <e-desc title="订单产品明细">
         <el-table
@@ -73,7 +78,7 @@
             align="center"
             min-width="120"
             :show-tooltip-when-overflow="true"
-            label="订单编号">
+            label="订单产品编号">
           </el-table-column>
           <el-table-column
             prop="price"
@@ -114,6 +119,8 @@
     <span slot="footer" class="dialog-footer">
       <el-button @click="onChose">返回</el-button>
     </span>
+    <!-- 文件预览 -->
+    <preview-component v-if="previewVisible" ref="preview"/>
   </div>
   <!-- </el-dialog> -->
 </template>
@@ -125,21 +132,26 @@
   import { getOrderDetail } from '@/api/sale'
   import uploadComponent from '../common/upload-component'
   import ApproveComponent from '../common/approve-component'
-  export default {
+  import PreviewComponent from '@/views/modules/common/preview-component'
+export default {
     name: 'order-detail',
     components: {
-      EDesc, EDescItem, uploadComponent, ApproveComponent
+      PreviewComponent,
+      EDesc,
+      EDescItem,
+      uploadComponent,
+      ApproveComponent
     },
     data () {
       return {
         visible: false,
         isFlow: false,
+        previewVisible: false,
         id: 0,
         dataForm: {},
         productDetails: [],
         stepList: [],
-        logList: [],
-        fileList: []
+        logList: []
       }
     },
     methods: {
@@ -156,7 +168,6 @@
         this.productDetails = []
         this.stepList = []
         this.logList = []
-        this.fileList = []
         this.getDetails(businessType)
       },
       getDetails (businessType) {
@@ -166,16 +177,6 @@
             // 流程图展示
             dealStepData(data.data.workFlowBusinessExt.workFlowProcessStepList, this.stepList)
             dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
-            // 附件
-            if (data.data.attachList) {
-              data.data.attachList.forEach((item) => {
-                this.fileList.push({
-                  name: item.fileName,
-                  url: item.url,
-                  id: item.url
-                })
-              })
-            }
             // 订单产品明细
             if (data.data.saleROrderProductList) {
               this.productDetails = data.data.saleROrderProductList
@@ -197,6 +198,13 @@
       approveFinished () {
         this.onChose()
         this.$emit('approveFinished')
+      },
+      // 预览
+      previewFile (fileName, url) {
+        this.previewVisible = true
+        this.$nextTick(() => {
+          this.$refs.preview.init(fileName, url)
+        })
       }
     }
   }

src/views/modules/tech/product-detail.vue

@@ -223,12 +223,14 @@ export default {
               this.productDetails.push(item)
             })
             // 产品配料清单
-            data.data.productMaterialList.forEach((item) => {
-              this.materialList.push(item)
-            })
+            if (data.data.productMaterialList) {
+              data.data.productMaterialList.forEach((item) => {
+                this.materialList.push(item)
+              })
+            }
             // 产品图纸
             if (data.data.proDrawings) {
-              this.dataForm.drawingIdList = []
+              // this.dataForm.drawingIdList = []
               data.data.proDrawings.forEach((item) => {
                 if (item.attachList) {
                   item.attachList.forEach((item1) => {