修改了委托单登记

components/file/entrust-file-manage/FileManageCont.vue

@@ -13,6 +13,10 @@
           <Form-item class="search-btn">
             <Button @click="_search" type="primary">搜索</Button>
           </Form-item>
+          <Form-item style="float: right">
+            <p>委托评审需要上传以下文件：</p>
+            <p>1、试验项目单 2、现场描述/样品照片等现场资料 3、相关技术要求</p>
+          </Form-item>
         </Form>
       </Col>
       <!--列表-->

components/file/entrust-file-manage/FilesList.vue

@@ -61,7 +61,7 @@
               fixed="right">
               <template slot-scope="scope">
                 <VXEIconList
-                  :msg="scope.row.type === 'pdf'?iconMsgJpg:iconMsg"
+                  :msg="scope.row.type === 'jpg'||scope.row.type === 'pdf' ?iconMsgJpg:iconMsg"
                   @on-result-change="_iconClick" :rowData="scope.row"></VXEIconList>
               </template>
             </vxe-table-column>
@@ -321,8 +321,17 @@ export default {
     },
     // 预览图片（该合同下所有的）
     _viewImg(data) {
-      this.$pdfView(data.objectKey)
-      console.log(data)
+      switch (data.type) {
+        case 'jpg':
+          const imgViewList = []
+          imgViewList.push(global.baseURL + this.downloadFileUrlFile + data.id)
+          this.imgViewList = imgViewList
+          this.imgViewIndex = 0
+          break
+        case 'pdf':
+          this.$pdfView(data.objectKey)
+          break
+      }
       // console.log(data)
       // if (this.urlData.viewUri === '/meter/v1/entrust_attachment/preview/') {
       //   const id = data.entrustId

pages/meter-entrust/entrust-register/EntrustRegister.vue

@@ -39,6 +39,7 @@
                 <template slot-scope="scope">
                   <span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
                   <span v-else-if="item.status">{{scope.row[item.key].display}}</span>
+                  <span v-else-if="item.key==='backReasons'" style="color: red">{{scope.row[item.key]}}</span>
                   <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>