修改了报告审核

api/soil/soil-sample.js

@@ -91,5 +91,22 @@ export default {
     http.get('/print/url/get_access_token', data).then(res => res),
   // 报告编制提交至报告审核
   reportMakeSubmit: data =>
-    http.post('soil/v1/entrust/report_make_submit?ids=' + data).then(res => res)
+    http
+      .post('soil/v1/entrust/report_make_submit?ids=' + data)
+      .then(res => res),
+  // 报告审核提交至报告签发
+  reportCheckSubmit: data =>
+    http
+      .post('soil/v1/entrust/report_check_submit?ids=' + data)
+      .then(res => res),
+  // 报告审核退回至报告编制
+  reportCheckBack: data =>
+    http
+      .post(
+        'soil/v1/entrust/report_check_back?ids=' +
+          data.ids +
+          '&reason=' +
+          data.remark
+      )
+      .then(res => res)
 }

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

@@ -16,19 +16,6 @@
         <Form-item class="search-item" label="委托编号:">
           <Input @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托编号" clearable />
         </Form-item>
-        <!--        <Form-item class="search-item" label="报检时间:">-->
-        <!--          <Date-picker-->
-        <!--            ref="sampleTime"-->
-        <!--            type="datetimerange"-->
-        <!--            placeholder="报检时间"-->
-        <!--            style="width: 100%;"-->
-        <!--            :editable="false"-->
-        <!--            transfer-->
-        <!--            @on-change="_labSampleTime"-->
-        <!--          />-->
-        <!--          <input type="hidden" name="inspectionDateBegin">-->
-        <!--          <input type="hidden" name="inspectionDateEnd">-->
-        <!--        </Form-item>-->
         <Form-item class="search-btn">
           <Button @click="_formSearch" type="primary">
             搜索
@@ -38,17 +25,6 @@
       <Col span="24">
       <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" show-search-btn="true" />
       </Col>
-      <!--      <Col span="24">-->
-      <!--      <Button type="primary" @click="_submitReportCheck">-->
-      <!--        提交-->
-      <!--      </Button>-->
-      <!--      <Button @click="_downloadByIds">-->
-      <!--        下载-->
-      <!--      </Button>-->
-      <!--      <Button type="warning" @click="_goBack">-->
-      <!--        退回-->
-      <!--      </Button>-->
-      <!--      </Col>-->
       <Col span="24">
       <PTVXETable
         ref="pageTable"
@@ -71,8 +47,8 @@
           sortable
         >
           <template slot-scope="scope" @click.stop="_handleIndex(scope)">
-            <span v-if="item.datetime">
-              {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }}
+            <span v-if="item.date">
+              {{ 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 }}
@@ -93,7 +69,7 @@
 
 <script>
 // eslint-disable-next-line import/named
-import { soilStatistics } from '../../../../api'
+import { soilSample, soilStatistics } from '../../../../api'
 import global from '../../../../api/config'
 import Reason from '../../../../components/base/Reason'
 import OperationModal from '../../../../components/operation/Operation'
@@ -104,17 +80,22 @@ export default {
     return {
       name: '',
       pageColumns: [
-        { title: '委托方', key: 'client', width: 200 },
-        { title: '联系人', key: 'person', width: 120 },
-        { title: '委托编号', key: 'entrustCode', width: 120 },
-        { title: '报告是否生成', key: 'reported', width: 120 },
-        { title: '状态', key: 'progress', width: 120, status: true },
-        { title: '电话/手机', key: 'tel', width: 120 },
-        { title: '传真', key: 'fax', width: 120 },
-        { title: '详细地址', key: 'address', width: 250 },
-        { title: '邮箱', key: 'email' },
-        { title: '费用合计', key: 'fee', width: 120 },
-        { title: '备注', key: 'remark' }
+        {
+          title: '委托商',
+          key: 'client',
+          width: 180,
+          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: 'progress', width: 110, status: true },
+        { title: '钻孔位置', key: 'boreholeLocation', width: 180 },
+        { title: '钻孔名称', key: 'boreholeName', width: 180 },
+        { title: '水深', key: 'waterDepth', width: 180 },
+        { title: '制表人', key: 'tabulater', width: 110 },
+        { title: '制表日期', key: 'tabulateDate', width: 110, date: true }
       ],
       btn: [
         { id: '', type: 'primary', name: '提交' },
@@ -127,9 +108,9 @@ export default {
       selectIds: [],
       selectData: [],
       iconMsg: [
-        { id: '', type: 'pt-a-view', name: '预览报告' },
-        { id: '', type: 'pt-a-cloud', name: '附件' },
-        { id: '', type: 'pt-a-clock', name: '操作日志' }
+        { id: '', type: 'md-image', name: '预览报告' },
+        { id: '', type: 'ios-cloud', name: '附件' },
+        { id: '', type: 'ios-clock', name: '操作日志' }
       ]
     }
   },
@@ -196,7 +177,7 @@ export default {
       }
     },
     _reportCheckBack: async function(data) {
-      const result = await soilStatistics.entrustReportCheckBack({
+      const result = await soilSample.reportCheckBack({
         ids: this.selectIds,
         remark: data
       })
@@ -257,7 +238,7 @@ export default {
     // 接口异步
     _submit: async function(ids) {
       if (ids.length === 0) return false
-      const result = await soilStatistics.submitEntrustReportCheck(ids)
+      const result = await soilSample.reportCheckSubmit(ids)
       if (result) {
         this.$Message.success('提交成功!')
         this._formSearch()
@@ -325,12 +306,13 @@ export default {
     },
 
     _getObjectKey: async function(data) {
-      const result = await soilStatistics.getObjectKey(data.id)
+      const result = await soilSample.getReport(data.id)
       if (result) {
         this.$openWindowModeless({
-          objectKey: result,
+          objectKey: result.objectKey,
           id: data.id,
-          isReport: 0
+          isReport: 4,
+          idType: 11
         })
       }
     },
@@ -378,6 +360,9 @@ export default {
             this.selectIds.push(this.selectData[i].id)
           }
           break
+        case 'iconClick':
+          this._iconClick(data.name, data.rowData, data.componentName)
+          break
         default:
           this._page()
       }
@@ -385,7 +370,6 @@ export default {
     _labSampleTime(data) {
       $('input[name="inspectionDateBegin"]').val(data[0])
       $('input[name="inspectionDateEnd"]').val(data[1])
-      console.log(data)
     },
     _formSearch() {
       this.$refs.pageTable._pageChange(1)