修改了制备审核

api/soil/soil-entrust.js

@@ -31,8 +31,16 @@ export default {
     http.post('soil/v1/entrust/page_sample_receive_his', data).then(res => res),
   pageSamplePrepare: data =>
     http.post('soil/v1/entrust/page_sample_prepare', data).then(res => res),
+  pageSamplePrepareCheck: data =>
+    http
+      .post('soil/v1/entrust/page_sample_prepare_check', data)
+      .then(res => res),
   pageSamplePrepareHis: data =>
     http.post('soil/v1/entrust/page_sample_prepare_his', data).then(res => res),
+  pageSamplePrepareCheckHis: data =>
+    http
+      .post('soil/v1/entrust/page_sample_prepare_check_his', data)
+      .then(res => res),
   getById: data => http.get('soil/v1/entrust/' + data).then(res => res),
   getVOById: data => http.get('soil/v1/entrust/vo/' + data).then(res => res),
   deleteById: data =>
@@ -81,6 +89,8 @@ export default {
     http.post('soil/v1/sample/send_sample', data).then(res => res),
   pagePrepare: data =>
     http.post('soil/v1/sample/page_prepare', data).then(res => res),
+  pagePrepareCheck: data =>
+    http.post('soil/v1/sample/page_prepare_check', data).then(res => res),
   pagePrepareHis: data =>
     http.post('soil/v1/sample/page_prepare_his', data).then(res => res),
   pagePrepareDetailHis: data =>

api/soil/soil-sample.js

@@ -179,5 +179,18 @@ export default {
   pageSecondaryHis: data =>
     http.post('soil/v1/prepare/page_secondary_his', data).then(res => res),
   sampleDeleteById: data =>
-    http.delete('soil/v1/sample/?ids=' + data).then(res => res)
+    http.delete('soil/v1/sample/?ids=' + data).then(res => res),
+  // 制备审核通过
+  prepareCheckOk: data =>
+    http.post('soil/v1/sample/prepare_check_ok?ids=' + data).then(res => res),
+  // 制备审核驳回
+  prepareCheckBack: data =>
+    http
+      .post(
+        'soil/v1/sample/prepare_check_back?ids=' +
+          data.ids +
+          '&remark=' +
+          data.remark
+      )
+      .then(res => res)
 }

pages/soil-sample-manage/sample-preparation-check/SampleManage.vue

@@ -4,14 +4,7 @@
            class="zIndex-900 modal-footer-none">
       <p slot="header">管理样品</p>
       <div>
-        <el-tabs v-model="activeName" @tab-click="_changeTabs">
-          <el-tab-pane label="制备管理" name="prepareManage">
       <SoilSampleManage ref="prepareManage"></SoilSampleManage>
-          </el-tab-pane>
-          <el-tab-pane label="原始记录填写" name="recordModal">
-            <RecordWrite ref="recordModal"></RecordWrite>
-          </el-tab-pane>
-        </el-tabs>
 <!--        <keep-alive>-->
 <!--          &lt;!&ndash; eslint-disable-next-line vue/require-component-is &ndash;&gt;-->
 <!--          <component ref="refModal" :is="currentComponent"></component>-->
@@ -21,12 +14,10 @@
   </div>
 </template>
 <script>
-import SoilSampleManage from '../SoilSampleManageTab'
-import RecordWrite from './sample-preparation-record/RecordIndex'
+import SoilSampleManage from './SoilSampleManage'
 export default {
   components: {
-    SoilSampleManage,
-    RecordWrite
+    SoilSampleManage
   },
   data() {
     return {
@@ -36,9 +27,7 @@ export default {
       showSampleModal: false,
       modalTitle: '',
       selectIds: [],
-      activeName: 'prepareManage',
-      name: '',
-      currentComponent: ''
+      name: ''
     }
   },
   mounted() {},
@@ -48,7 +37,6 @@ export default {
       this.name = name
       this.showSampleModal = true
       this.entrustId = entrustId // 委托id
-      this.activeName = 'prepareManage'
       this.selectIds = []
       this._preparePage()
     },
@@ -56,23 +44,8 @@ export default {
     _preparePage() {
       this.$refs.prepareManage._open(this.entrustId)
     },
-    // 原始记录填写
-    _recordPage() {
-      this.$refs.recordModal._open(this.entrustId)
-    },
-    _changeTabs(tab, event) {
-      if (tab.name === 'prepareManage') {
-        // this._issuedPage()
-        this.$refs.prepareManage._open(this.entrustId)
-        this.$refs.recordModal._clearTable()
-      } else {
-        this.$refs.recordModal._open(this.entrustId)
-      }
-    },
-    // 关闭弹框的时候刷新上个界面
     _visibleChange(data) {
-      if (data === false) {
-      }
+      this.$emit('on-result-change')
     }
   }
 }

pages/soil-sample-manage/sample-preparation-check/SamplePreparation.vue

@@ -60,8 +60,6 @@ import Operation from '../../../components/operation/Operation'
 import global from '../../../api/config'
 import SampleManage from './SampleManage'
 import SamplePreparationEdit from './SamplePreparationEdit'
-import SoilSampleItemManageEdit from './SoilSampleItemManageEdit'
-import SoilEntrustItemNum from './SoilItemNum'
 export default {
   components: {
     // eslint-disable-next-line vue/no-unused-components
@@ -69,11 +67,7 @@ export default {
     // eslint-disable-next-line vue/no-unused-components
     SamplePreparationEdit,
     // eslint-disable-next-line vue/no-unused-components
-    SampleManage,
-    // eslint-disable-next-line vue/no-unused-components
-    SoilSampleItemManageEdit,
-    // eslint-disable-next-line vue/no-unused-components
-    SoilEntrustItemNum
+    SampleManage
   },
   data() {
     return {
@@ -88,16 +82,6 @@ export default {
           name: '试样列表'
         },
         {
-          type: 'ios-apps',
-          id: '',
-          name: '试验项目列表'
-        },
-        {
-          type: 'ios-calculator-outline',
-          id: '',
-          name: '项目量统计'
-        },
-        {
           type: 'ios-download',
           id: '',
           name: '导出开土制备记录'
@@ -182,12 +166,6 @@ export default {
           case '编辑':
             this._editModal(true, data.id)
             break
-          case '试验项目列表':
-            this._itemManage(data.id)
-            break
-          case '项目量统计':
-            this._itemNumManage(data.id)
-            break
           case '导出开土制备记录':
             this._exportPrepare(data.id)
             break
@@ -315,7 +293,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await soilEntrust.pageSamplePrepare(
+      const result = await soilEntrust.pageSamplePrepareCheck(
         this.$serializeForm(this.formObj)
       )
       if (result) {
@@ -346,20 +324,6 @@ export default {
         this.$refs.editModal._open()
       }
     },
-    // 追加项目
-    _itemManage(data) {
-      this.currentComponent = 'SoilSampleItemManageEdit'
-      this.$nextTick(() => {
-        this.$refs.refModal._openByEntrustId(data)
-      })
-      // this.$refs.itemManageModal._openByEntrustId(data)
-    },
-    _itemNumManage(data) {
-      this.currentComponent = 'SoilEntrustItemNum'
-      this.$nextTick(() => {
-        this.$refs.refModal._open(data)
-      })
-    },
     _uploadPhoto(data) {
       // 上传照片文件
       this.currentComponent = 'PhotoManage'

pages/soil-sample-manage/sample-preparation-check/SamplePreparationHis.vue

@@ -250,7 +250,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await soilEntrust.pageSamplePrepareHis(this.formObj)
+      const result = await soilEntrust.pageSamplePrepareCheckHis(this.formObj)
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result

pages/soil-sample-manage/sample-preparation/Preparation.vue

@@ -36,7 +36,7 @@
                                  placeholder="输入或选择制备方式"></AutoComplete>
                 </div>
                 <div v-else-if="item.key==='printNum'" @click="_handleRow(scope)">
-                  <el-input v-model="scope.row.printNum" name="printNum" placeholder="输入打印数量">
+                  <el-input v-model="scope.row.printNum" @input="inputChange(scope)" name="printNum"  placeholder="输入打印数量">
                   </el-input>
                 </div>
                 <div v-else-if="item.key==='unit'" @click="_handleRow(scope)">
@@ -149,6 +149,7 @@ export default {
       getPage: {
         records: []
       },
+      currentIndex: -1,
       selectData: [],
       selectIds: [],
       pageColumns: [
@@ -206,6 +207,10 @@ export default {
     this.$refs.pageTable._showLoading()
   },
   methods: {
+    inputChange(data) {
+      this.$forceUpdate()
+      this.getPage.records[data.$rowIndex].printNum = data.row.printNum
+    },
     // 获取存储位置
     _locationChange(msg, data, handleObj) {
       this.currentRow = handleObj
@@ -332,6 +337,7 @@ export default {
           console.log(result[j].prepareDate)
           console.log(new Date(result[j].prepareDate))
           this.getPage.records[j].prepareDate = new Date(result[j].prepareDate)
+          this.getPage.records[j].printNum = 1
         }
         this.$refs.pageTable._hideLoading()
       }