修改了报告管理

pages/soil-report-manage/report-audit/tabs/reportAudit.vue

@@ -51,7 +51,8 @@
               {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
             </span>
             <div v-else-if="item.status">
-              {{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}
+              <span v-if="scope.row[item.key].display === '报告审核退回'" style="color: red;">123456</span>
+              <span v-else>{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
             </div>
             <span v-else>
               {{ scope.row[item.key] }}
@@ -83,17 +84,17 @@ export default {
         {
           title: '委托商',
           key: 'client',
-          width: 180,
+          width: 100,
           fixed: 'left'
         },
-        { title: '委托编号', key: 'entrustCode', width: 180 },
-        { title: '报告编号', key: 'reportCode', width: 180 },
-        { title: '状态', key: 'status', width: 110, status: true },
-        { title: '委托日期', key: 'entrustDate', width: 180, date: true },
+        { title: '委托编号', key: 'entrustCode', width: 100 },
+        { title: '报告编号', key: 'reportCode', width: 100 },
         { title: '进度', key: 'progress', width: 110, status: true },
-        { title: '钻孔位置', key: 'boreholeLocation', width: 180 },
-        { title: '钻孔名称', key: 'boreholeName', width: 180 },
-        { title: '水深', key: 'waterDepth', width: 180 },
+        { title: '状态', key: 'status', width: 100, status: true },
+        { title: '委托日期', key: 'entrustDate', width: 100, date: true },
+        { title: '钻孔位置', key: 'boreholeLocation', width: 100 },
+        { title: '钻孔名称', key: 'boreholeName', width: 100 },
+        { title: '水深', key: 'waterDepth', width: 100 },
         { title: '制表人', key: 'tabulater', width: 110 },
         { title: '制表日期', key: 'tabulateDate', width: 110, date: true }
       ],

pages/soil-report-manage/report-issue/tabs/reportIssue.vue

@@ -108,17 +108,17 @@ export default {
         {
           title: '委托商',
           key: 'client',
-          width: 180,
+          width: 100,
           fixed: 'left'
         },
-        { title: '委托编号', key: 'entrustCode', width: 180 },
-        { title: '报告编号', key: 'reportCode', width: 180 },
-        { title: '状态', key: 'status', width: 110, status: true },
-        { title: '委托日期', key: 'entrustDate', width: 180, date: true },
+        { title: '委托编号', key: 'entrustCode', width: 100 },
+        { title: '报告编号', key: 'reportCode', width: 100 },
         { title: '进度', key: 'progress', width: 110, status: true },
-        { title: '钻孔位置', key: 'boreholeLocation', width: 180 },
-        { title: '钻孔名称', key: 'boreholeName', width: 180 },
-        { title: '水深', key: 'waterDepth', width: 180 },
+        { title: '状态', key: 'status', width: 100, status: true },
+        { title: '委托日期', key: 'entrustDate', width: 100, date: true },
+        { title: '钻孔位置', key: 'boreholeLocation', width: 100 },
+        { title: '钻孔名称', key: 'boreholeName', width: 100 },
+        { title: '水深', key: 'waterDepth', width: 100 },
         { title: '制表人', key: 'tabulater', width: 110 },
         { title: '制表日期', key: 'tabulateDate', width: 110, date: true }
       ],

pages/soil-report-manage/report-make/OriginalRecordView.vue

 <template>
   <div>
-    <Modal v-model="showModal" width="1200"
-           class="zIndex-900 modal-footer-none">
+    <Modal v-model="showModal" @on-visible-change="_visibleChange"
+           width="1200" class="zIndex-900 modal-footer-none">
       <div slot="header"><p>查看原始记录</p></div>
     <Row>
       <!--查询-->
@@ -229,6 +229,11 @@ export default {
         }
       })
     },
+    _visibleChange(data) {
+      if (data === false) {
+        this.$emit('on-result-change')
+      }
+    },
     _reportMake(data) {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请至少选择一条数据')

pages/soil-report-manage/report-make/tabs/ReportMakeByEntrust.vue

@@ -14,9 +14,6 @@
               <Form-item class="search-item" label="委托编号:">
                 <Input @on-enter="_formSearch" v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托编号" clearable/>
               </Form-item>
-              <Form-item class="search-item" label="样品编号:">
-                <Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入样品编号" clearable/>
-              </Form-item>
               <Form-item class="search-btn">
                 <Button @click="_formSearch" type="primary">搜索</Button>
               </Form-item>
@@ -50,8 +47,8 @@
                 :key="item.key"
                 :field="item.key"
                 :title="item.title"
+                :min-width="100"
                 :width="item.width"
-                :min-width="200"
                 :fixed="item.fixed?item.fixed:undefined"
                 sortable
               >
@@ -65,7 +62,8 @@
                     scope.row[item.key]===0?'否':''}}
                   </div>
                   <div v-else-if="item.status">
-                    {{scope.row[item.key].display}}
+                    <span v-if="scope.row[item.key].display === '报告审核退回'||'报告签发退回' ===scope.row[item.key].display " style="color: red;">{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
+                    <span v-else>{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
                   </div>
                   <div v-else-if="item.judge">
                     {{Number(scope.row[item.key]) === 0? '否':'是'}}
@@ -81,7 +79,7 @@
     <SampleByMakeModal ref="sampleByMakeModal"></SampleByMakeModal>
     <Operation ref="operation"></Operation>
     <FileManage ref="FileManage"></FileManage>
-    <OriginalRecordView ref="originalRecordView"></OriginalRecordView>
+    <OriginalRecordView ref="originalRecordView" @on-result-change="_page"></OriginalRecordView>
     <UploadByReport ref="uploadReport" @on-result-change="_page"></UploadByReport>
   </div>
 </template>
@@ -108,16 +106,17 @@ export default {
         {
           title: '委托商',
           key: 'client',
-          width: 180,
+          width: 100,
           fixed: 'left'
         },
-        { title: '委托编号', key: 'entrustCode', width: 180 },
-        { title: '报告编号', key: 'reportCode', width: 180 },
-        { title: '水深', key: 'waterDepth', width: 180 },
-        { title: '报告是否已编制', key: 'reported', width: 180 },
-        { title: '状态', key: 'status', width: 110, status: true },
-        { title: '委托日期', key: 'entrustDate', width: 180, date: true },
+        { title: '委托编号', key: 'entrustCode', width: 100 },
+        { title: '报告编号', key: 'reportCode', width: 100 },
         { title: '进度', key: 'progress', width: 110, status: true },
+        { title: '状态', key: 'status', width: 100, status: true },
+        { title: '委托日期', key: 'entrustDate', width: 100, date: true },
+        { title: '钻孔位置', key: 'boreholeLocation', width: 100 },
+        { title: '钻孔名称', key: 'boreholeName', width: 100 },
+        { title: '水深', key: 'waterDepth', width: 100 },
         { title: '制表人', key: 'tabulater', width: 110 },
         { title: '制表日期', key: 'tabulateDate', width: 110, date: true }
       ],