Merge remote-tracking branch 'origin/dev' into dev

api/soil/soil-statistics.js

@@ -7,32 +7,10 @@ import http from '../http'
 
 export default {
   // 检测依据管理
-  standardPage: data =>
-    http.post('soil/v1/standard/page', data).then(res => res),
-  standardGetById: data =>
-    http.get('soil/v1/standard/' + data).then(res => res),
-  standardSave: data => http.post('soil/v1/standard/', data).then(res => res),
-  standardEdit: data =>
-    http.put('soil/v1/standard/' + data.id, data.obj).then(res => res),
-  standardDeleteById: data =>
-    http.delete('soil/v1/standard/?ids=' + data).then(res => res),
-  // 试验项目
-  // page
-  page: data => http.post('soil/v1/aptitude_exp/page', data).then(res => res),
-  getById: data => http.get('soil/v1/aptitude_exp/' + data).then(res => res),
-  deleteById: data =>
-    http.delete('soil/v1/aptitude_exp/?ids=' + data).then(res => res),
-  // 保存
-  save: data => http.post('soil/v1/aptitude_exp/', data).then(res => res),
-  edit: data =>
-    http.put('soil/v1/aptitude_exp/' + data.id, data.obj).then(res => res),
-  // 指标页面
-  expItemPage: data =>
-    http.post('soil/v1/exp_item/page', data).then(res => res),
-  expItemDeleteByIds: data =>
-    http.delete('soil/v1/exp_item/?ids=' + data).then(res => res),
-  expItemSave: data => http.post('soil/v1/exp_item/', data).then(res => res),
-  expItemEdit: data =>
-    http.put('soil/v1/exp_item/' + data.id, data.obj).then(res => res),
-  expItemGetById: data => http.get('soil/v1/exp_item/' + data).then(res => res)
+  pageReportMake: data =>
+    http.post('soil/v1/entrust/page_report_make', data).then(res => res),
+  pageReportCheck: data =>
+    http.post('soil/v1/entrust/page_report_check', data).then(res => res),
+  pageReportIssue: data =>
+    http.post('soil/v1/entrust/page_report_issue', data).then(res => res)
 }

api/soil/soil-test.js

@@ -61,5 +61,41 @@ export default {
   itemSave: data => http.post('soil/v1/item/', data).then(res => res),
   itemEdit: data =>
     http.put('soil/v1/item/' + data.id, data.obj).then(res => res),
-  itemGetById: data => http.get('soil/v1/item/' + data).then(res => res)
+  itemGetById: data => http.get('soil/v1/item/' + data).then(res => res),
+  endExp: data =>
+    http.post('soil/v1/experiment/end_exp?ids=' + data).then(res => res),
+  pageExpCheck: data =>
+    http.post('soil/v1/entrust/page_exp_check', data).then(res => res),
+  endExpCheck: data =>
+    http.post('soil/v1/experiment/end_exp_check?ids=' + data).then(res => res),
+  endExpAudit: data =>
+    http.post('soil/v1/experiment/end_exp_audit?ids=' + data).then(res => res),
+  pageCheckByExp: data =>
+    http.post('soil/v1/experiment/page_check_by_exp', data).then(res => res),
+  pageExpByCheck: data =>
+    http.post('soil/v1/experiment/page_exp_check', data).then(res => res),
+  pageExpAudit: data =>
+    http.post('soil/v1/entrust/page_exp_audit', data).then(res => res),
+  pageAuditByExp: data =>
+    http.post('soil/v1/experiment/page_audit_by_exp', data).then(res => res),
+  pageExpByAudit: data =>
+    http.post('soil/v1/experiment/page_exp_audit', data).then(res => res),
+  auditBack: data =>
+    http
+      .post(
+        'soil/v1/experiment/exp_audit_back?ids=' +
+          data.ids +
+          '&remark=' +
+          data.remark
+      )
+      .then(res => res),
+  checkBack: data =>
+    http
+      .post(
+        'soil/v1/experiment/exp_check_back?ids=' +
+          data.ids +
+          '&remark=' +
+          data.remark
+      )
+      .then(res => res)
 }

pages/soil-report-manage/report-audit/ReportAuditIndex.vue

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="报告审核" name="lab">
+            <reportMake ref="labTabs" />
+          </el-tab-pane>
+          <el-tab-pane label="历史任务" name="his">
+            <historyTask ref="hisTabs" />
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import reportMake from './tabs/reportAudit'
+import historyTask from './tabs/historyTask'
+
+export default {
+  components: { reportMake, historyTask },
+  data() {
+    return {
+      activeName: 'lab'
+    }
+  },
+  mounted() {
+    this.activeName = 'lab'
+    this._page()
+  },
+  methods: {
+    _changeTabs(tab, event) {
+      if (tab.name === 'lab') {
+        this._page()
+      } else {
+        this.$refs.hisTabs._clearPage()
+        this.$refs.hisTabs._page()
+      }
+    },
+    _page() {
+      this.$refs.labTabs._clearPage()
+      this.$refs.labTabs._page()
+    }
+  }
+}
+</script>

pages/soil-report-manage/report-issue/ReportIssueIndex.vue

+<template>
+  <div>
+    <div class="layout-content-padding">
+      <div class="layout-content-main">
+        <el-tabs v-model="activeName" @tab-click="_changeTabs">
+          <el-tab-pane label="报告签发" name="lab">
+            <reportMake ref="labTabs" />
+          </el-tab-pane>
+          <el-tab-pane label="历史任务" name="his">
+            <historyTask ref="hisTabs" />
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import reportMake from './tabs/reportIssue'
+import historyTask from './tabs/historyTask'
+
+export default {
+  components: { reportMake, historyTask },
+  data() {
+    return {
+      activeName: 'lab'
+    }
+  },
+  mounted() {
+    this.activeName = 'lab'
+    this._page()
+  },
+  methods: {
+    _changeTabs(tab, event) {
+      if (tab.name === 'lab') {
+        this._page()
+      } else {
+        this.$refs.hisTabs._clearPage()
+        this.$refs.hisTabs._page()
+      }
+    },
+    _page() {
+      this.$refs.labTabs._clearPage()
+      this.$refs.labTabs._page()
+    }
+  }
+}
+</script>

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

@@ -47,18 +47,9 @@
             </Form>
           </Col>
           <Col span="24">
-            <BtnList :msg="btn" :open="searchOpen" :showSearchBtn="true" @on-result-change="_btnClick"
+            <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="true" @on-result-change="_btnClick"
                      class="contHide">
-              <!--切换待认领任务-->
-              <template slot="processTask">
-                <div class="fr process-task">
-                  <el-checkbox v-model="formObj.personal" @change="_page" :true-label="1" :false-label="0"
-                               size="medium">
-                    个人任务
-                  </el-checkbox>
-                </div>
-              </template>
-            </BtnList>
+            </btn-list>
           </Col>
           <!-- 表格 -->
           <Col span="24">

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

@@ -79,13 +79,15 @@
       </div>
     </div>
     <SampleByMakeModal ref="sampleByMakeModal"></SampleByMakeModal>
+    <Operation ref="operation"></Operation>
   </div>
 </template>
 <script>
-import { soilTest } from '../../../../api'
+import { soilStatistics } from '../../../../api'
 import SampleByMakeModal from '../SampleByMakeModal'
+import Operation from '../../../../components/operation/Operation'
 export default {
-  components: { SampleByMakeModal },
+  components: { SampleByMakeModal, Operation },
   data() {
     return {
       typeList: [{ name: '企业', value: 0 }, { name: '政府', value: 1 }],
@@ -94,33 +96,19 @@ export default {
       formObj: {},
       pageColumns: [
         {
-          title: '委托单位',
-          key: 'cname',
+          title: '委托商',
+          key: 'client',
           width: 180,
-          detail: true,
           fixed: 'left'
         },
-        { title: '委托名称', key: 'name', width: 160 },
-        { title: '委托编号', key: 'code', width: 180 },
-        { title: '类型', key: 'type', width: 80, type: true },
-        { title: '状态', key: 'progress', width: 110, status: true },
-        { title: '应出报告日期', key: 'reportDueDate', width: 130, date: true },
-        { title: '是否判定', key: 'judge', width: 100, judge: true },
-        {
-          title: '报告剩余天数',
-          key: 'reportRemainDay',
-          width: 130,
-          day: true
-        },
-        { title: '报告进度统计', key: 'reportProgress', width: 450 },
-        { title: '主联系人', key: 'linkman', width: 100 },
-        { title: '联系手机', key: 'tel', width: 120 },
-        { title: '检测类型', key: 'detectType', width: 130 },
-        { title: '服务类型', key: 'serviceType', width: 120 },
-        { title: '是否带照片', key: 'havePhoto', width: 120 },
-        { title: '报告语言', key: 'reportType', width: 100 },
-        { title: '报告类别', key: 'reportClass', width: 120 },
-        { title: '备注', key: 'remark' }
+        { title: '委托编号', key: 'entrustCode', width: 180 },
+        { title: '报告编号', key: 'reportCode', width: 180 },
+        { title: '水深', key: 'waterDepth', 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: 'tabulater', width: 110 },
+        { title: '制表日期', key: 'tabulateDate', width: 110, date: true }
       ],
       iconMsg: [
         {
@@ -227,7 +215,7 @@ export default {
             this.$refs.refModal._open(data)
             break
           case '操作记录':
-            this.$refs.refModal._open(data.id)
+            this._operationRecord(data.id)
             break
           case '附件':
             this._upload(data.id)
@@ -235,6 +223,10 @@ export default {
         }
       })
     },
+    _operationRecord(id) {
+      // 操作日志
+      this.$refs.operation._open(id)
+    },
     _tableResultChange(msg, data) {
       switch (msg) {
         case 'page':
@@ -254,7 +246,7 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      const result = await soilTest.pageExpTest(
+      const result = await soilStatistics.pageReportMake(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-test-manage/test-data-audit/DataAudit.vue

@@ -402,7 +402,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await soilTest.pageExpTest(
+      const result = await soilTest.pageExpAudit(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-test-manage/test-data-audit/item-tabs/ItemLeftList.vue

@@ -104,7 +104,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       this.formObj.entrustId = this.id
-      const result = await soilTest.pageTestByExp(
+      const result = await soilTest.pageAuditByExp(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-test-manage/test-data-audit/item-tabs/ItemRightList.vue

@@ -50,6 +50,7 @@
 <!--    <SelectOriTempRecord ref="recordModal" @on-result-change="_page"></SelectOriTempRecord>-->
 <!--    <OriginalRecordEdit ref="editModal"></OriginalRecordEdit>-->
     <IndexManage ref="indexModal" @on-result-change="_page"></IndexManage>
+    <Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
   </div>
 </template>
 <script>
@@ -59,9 +60,11 @@ import AssignPerson from '../../../../components/user-info-single/AssignPerson'
 // import SelectOriTempRecord from '../SelectOriTempRecord'
 // import OriginalRecordEdit from '../OriginalRecordEdit'
 import IndexManage from '../IndexManage'
+import Reason from '../../../../components/base/Reason'
 export default {
   components: {
     AssignPerson,
+    Reason,
     // SelectOriTempRecord,
     // OriginalRecordEdit,
     IndexManage
@@ -103,7 +106,7 @@ export default {
       ],
       btn: [
         { type: 'success', id: '', name: '提交' },
-        { type: 'waring', id: '', name: '退回' },
+        { type: '', id: '', name: '退回' },
         { type: '', id: 'food-task-assign-adjust-group', name: '调整分组' },
         {
           type: '',
@@ -157,6 +160,21 @@ export default {
     // this._dicSearch()
   },
   methods: {
+    _reasonResult(data) {
+      if (undefined !== data && data !== '') {
+        this._reportCheckBack(data)
+      }
+    },
+    _reportCheckBack: async function(data) {
+      const result = await soilTest.auditBack({
+        ids: this.selectIds,
+        remark: data
+      })
+
+      if (result) {
+        this._resultChange('退回成功')
+      }
+    },
     _iconClick(res, data, currentComponent) {
       this.$nextTick(() => {
         switch (res) {
@@ -170,6 +188,13 @@ export default {
         }
       })
     },
+    _auditBack() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this.$refs.reasonModal._open('退回原因')
+      }
+    },
     _indexManage(data) {
       this.$refs.indexModal._open(data)
     },
@@ -322,6 +347,12 @@ export default {
           // await this._reportDueDate()
           // await this._userAssign()
           break
+        case '提交':
+          this._submitToMake()
+          break
+        case '退回':
+          this._auditBack()
+          break
         case '试验项目分配':
           this._userAssign()
           break
@@ -353,6 +384,25 @@ export default {
           break
       }
     },
+    _submitToMake() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定提交该数据？',
+          onOk: () => {
+            this._submitToMakeOk()
+          }
+        })
+      }
+    },
+    _submitToMakeOk: async function() {
+      const result = await soilTest.endExpAudit(this.selectIds.join(','))
+      if (result) {
+        this._resultChange('提交成功')
+      }
+    },
     _addRecord() {
       if (this.selectIds.length === 0) {
         this.$message.warning('请至少选择一条数据')
@@ -428,7 +478,7 @@ export default {
       this.formObj.entrustId = this.entrustId
       this.formObj.name = this.leftSelectData.name
       this.formObj.testMethod = this.leftSelectData.testMethod
-      const result = await soilTest.pageExperimentTest(
+      const result = await soilTest.pageExpByAudit(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-test-manage/test-data-check/DataCheck.vue

@@ -402,7 +402,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await soilTest.pageExpTest(
+      const result = await soilTest.pageExpCheck(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-test-manage/test-data-check/item-tabs/ItemLeftList.vue

@@ -104,7 +104,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       this.formObj.entrustId = this.id
-      const result = await soilTest.pageTestByExp(
+      const result = await soilTest.pageCheckByExp(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-test-manage/test-data-check/item-tabs/ItemRightList.vue

@@ -50,6 +50,7 @@
 <!--    <SelectOriTempRecord ref="recordModal" @on-result-change="_page"></SelectOriTempRecord>-->
 <!--    <OriginalRecordEdit ref="editModal"></OriginalRecordEdit>-->
     <IndexManage ref="indexModal" @on-result-change="_page"></IndexManage>
+    <Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
   </div>
 </template>
 <script>
@@ -59,9 +60,11 @@ import AssignPerson from '../../../../components/user-info-single/AssignPerson'
 // import SelectOriTempRecord from '../SelectOriTempRecord'
 // import OriginalRecordEdit from '../OriginalRecordEdit'
 import IndexManage from '../IndexManage'
+import Reason from '../../../../components/base/Reason'
 export default {
   components: {
     AssignPerson,
+    Reason,
     // SelectOriTempRecord,
     // OriginalRecordEdit,
     IndexManage
@@ -157,6 +160,21 @@ export default {
     // this._dicSearch()
   },
   methods: {
+    _reasonResult(data) {
+      if (undefined !== data && data !== '') {
+        this._reportCheckBack(data)
+      }
+    },
+    _reportCheckBack: async function(data) {
+      const result = await soilTest.checkBack({
+        ids: this.selectIds,
+        remark: data
+      })
+
+      if (result) {
+        this._resultChange('退回成功')
+      }
+    },
     _iconClick(res, data, currentComponent) {
       this.$nextTick(() => {
         switch (res) {
@@ -328,6 +346,12 @@ export default {
         case '填写原始记录':
           this._addRecord()
           break
+        case '提交':
+          this._submitToAudit()
+          break
+        case '退回':
+          this._checkBack()
+          break
         case '按组分配':
           await this._reportDueDate()
           await this._groupAssign()
@@ -353,6 +377,32 @@ export default {
           break
       }
     },
+    _checkBack() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this.$refs.reasonModal._open('退回原因')
+      }
+    },
+    _submitToAudit() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定提交该数据？',
+          onOk: () => {
+            this._submitToAuditOk()
+          }
+        })
+      }
+    },
+    _submitToAuditOk: async function() {
+      const result = await soilTest.endExpCheck(this.selectIds.join(','))
+      if (result) {
+        this._resultChange('提交成功')
+      }
+    },
     _addRecord() {
       if (this.selectIds.length === 0) {
         this.$message.warning('请至少选择一条数据')
@@ -428,7 +478,7 @@ export default {
       this.formObj.entrustId = this.entrustId
       this.formObj.name = this.leftSelectData.name
       this.formObj.testMethod = this.leftSelectData.testMethod
-      const result = await soilTest.pageExperimentTest(
+      const result = await soilTest.pageExpByCheck(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue

@@ -38,6 +38,7 @@
               <span
                 v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
               <span v-else-if="item.datetime">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM'):''}}</span>
+              <span v-else-if="item.key==='progress'">{{scope.row[item.key].display}}</span>
               <span v-else>{{scope.row[item.key]}}</span>
             </template>
           </vxe-table-column>
@@ -103,6 +104,7 @@ export default {
       ],
       btn: [
         { type: 'success', id: '', name: '填写原始记录' },
+        { type: 'success', id: '', name: '完成提交' },
         { type: '', id: 'food-task-assign-adjust-group', name: '调整分组' },
         {
           type: '',
@@ -122,9 +124,9 @@ export default {
         { title: '试样深度', key: 'sampleDepth', width: 180 },
         { title: '试样包装类型', key: 'samplePack', width: 180 },
         { title: '是否填写原始记录', key: 'recorded', width: 180 },
+        { title: '状态', key: 'progress', width: 180 },
         { title: '大类', key: 'mainType', width: 140 },
         { title: '小类', key: 'smallType', width: 140 },
-        { title: '原始记录是否填写', key: 'recorded', width: 140 },
         { title: '检测方法', key: 'testMethod', width: 260 },
         { title: '检测依据', key: 'testBasis', width: 140 },
         { title: '检测科室', key: 'groupName', width: 150 }
@@ -328,6 +330,9 @@ export default {
         case '填写原始记录':
           this._addRecord()
           break
+        case '完成提交':
+          this._submitItem(this.selectData)
+          break
         case '按组分配':
           await this._reportDueDate()
           await this._groupAssign()
@@ -353,6 +358,26 @@ export default {
           break
       }
     },
+    _submitItem(data) {
+      console.log(data)
+      if (data[0].recorded !== '是') {
+        this.$Message.warning('未编制报告不能提交')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确定提交该数据？',
+          onOk: () => {
+            this._submitOk()
+          }
+        })
+      }
+    },
+    _submitOk: async function() {
+      const result = await soilTest.endExp(this.selectIds.join(','))
+      if (result) {
+        this._resultChange('提交成功')
+      }
+    },
     _addRecord() {
       if (this.selectIds.length === 0) {
         this.$message.warning('请至少选择一条数据')

router/soil-routes.js

@@ -23,6 +23,8 @@ import yearDeclara from '../pages/soil-statistics/yearDeclara'
 import MeterCustomerEntrust from '../pages/soil-statistics/customer-entrust/MeterCustomerEntrust'
 import MeterPersonalTask from '../pages/soil-statistics/personal-task/MeterPersonalTask'
 import MeterAnnualEntrust from '../pages/soil-statistics/annual-entrust/MeterAnnualEntrust'
+import ReportAuditIndex from '../pages/soil-report-manage/report-audit/ReportAuditIndex'
+import ReportIssueIndex from '../pages/soil-report-manage/report-issue/ReportIssueIndex'
 import Blank from '~/pages/blank'
 export default [
   {
@@ -116,6 +118,16 @@ export default [
         path: 'make_report',
         component: ReportMakeIndex,
         meta: { title: '报告编制' }
+      },
+      {
+        path: 'report_audit',
+        component: ReportAuditIndex,
+        meta: { title: '报告审核' }
+      },
+      {
+        path: 'report_issue',
+        component: ReportIssueIndex,
+        meta: { title: '报告签发' }
       }
     ]
   },