修改了开土制备

components/base/Reason.vue

@@ -83,6 +83,7 @@ export default {
           )
           this.showModal = false
         } else {
+          this.$refs.footerModal._hideLoading()
           this.$Message.error('表单验证失败!')
         }
       })

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

@@ -284,6 +284,7 @@ export default {
           title: '提示',
           content: '确定要提交 ' + ids.length + ' 条记录？',
           onOk: () => {
+            this.$refs.pageTable._showLoading()
             this._subToSkipRe(ids)
           }
         })
@@ -299,6 +300,7 @@ export default {
           title: '提示',
           content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
           onOk: () => {
+            this.$refs.pageTable._showLoading()
             this._subToRe(ids)
           }
         })
@@ -320,6 +322,7 @@ export default {
     _resultChange(msg) {
       this.$Message.success(msg)
       this._page()
+      this.$refs.pageTable._hideLoading()
     },
     _record(id) {
       this.currentComponent = 'Operation'

pages/meter-entrust/entrust-review/ReviewEntrust.vue

@@ -185,12 +185,12 @@ export default {
       }
     },
     _reasonResult(data) {
+      this.$refs.pageTable._showLoading()
       if (undefined !== data && data !== '') {
         this._reportCheckBack(data)
       }
     },
     _reportCheckBack: async function(data) {
-      console.log('开始退回')
       const result = await soilEntrust.back({
         ids: this.selectIds,
         remark: data
@@ -198,8 +198,8 @@ export default {
 
       if (result) {
         this.$Message.success('退回成功！')
-        console.log('退回成功')
         await this._page()
+        this.$refs.pageTable._hideLoading()
       }
     },
     _iconClick(res, data) {
@@ -293,6 +293,7 @@ export default {
         title: '提示',
         content: '确定通过该委托单？',
         onOk: () => {
+          this.$refs.pageTable._showLoading()
           this._passEntrustReview(this.selectIds)
         }
       })
@@ -302,6 +303,7 @@ export default {
       if (result) {
         this.$Message.success('提交成功！')
         await this._page()
+        this.$refs.pageTable._hideLoading()
       }
     },
 

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

@@ -63,6 +63,7 @@
 import { soilAptitude, soilEntrust } from '../../../api'
 import MeterEntrustRecord from '../../../components/operation/Operation'
 import SoilSampleManageHis from '../SoilSampleManageHis'
+import global from '../../../api/config'
 export default {
   // eslint-disable-next-line vue/no-unused-components
   components: { SoilSampleManageHis, MeterEntrustRecord },
@@ -90,6 +91,11 @@ export default {
           name: '试样照片'
         },
         {
+          type: 'ios-download',
+          id: '',
+          name: '导出开土制备记录'
+        },
+        {
           type: 'md-cloud',
           id: '',
           name: '附件'
@@ -160,6 +166,9 @@ export default {
           case '资质项目':
             this._itemModal(data.id)
             break
+          case '导出开土制备记录':
+            this._exportPrepare(data.id)
+            break
           case '附件':
             this._upload(data.id)
             break
@@ -181,6 +190,20 @@ export default {
         }
       })
     },
+    _exportPrepare(id) {
+      this.$Modal.confirm({
+        title: '提示',
+        content: '确定导出这条记录',
+        onOk: () => {
+          window.open(
+            global.baseURL +
+              '/soil/v1/entrust/export_soil_prepare_record?ids=' +
+              id,
+            '_blank'
+          )
+        }
+      })
+    },
     _componentResult(data, msg) {
       switch (this.currentComponent) {
         default:

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

@@ -2,14 +2,6 @@
   <div>
     <div class="layout-content-padding">
       <div class="layout-content-main">
-<!--        <el-tabs v-model="activeName" @tab-click="_changeTabs">-->
-<!--          <el-tab-pane label="待完成" name="wait">-->
-<!--            <MeterSendEntrust ref="waitTabs"></MeterSendEntrust>-->
-<!--          </el-tab-pane>-->
-<!--          <el-tab-pane label="历史记录" name="his">-->
-<!--            <MeterSendEntrustHis ref="hisTabs"></MeterSendEntrustHis>-->
-<!--          </el-tab-pane>-->
-<!--        </el-tabs>-->
         <el-tabs v-model="activeName" @tab-click="_changeTabs">
           <el-tab-pane label="待完成" name="wait"></el-tab-pane>
           <el-tab-pane label="历史记录" name="his"></el-tab-pane>

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

@@ -9,11 +9,16 @@
         <Row>
           <!--查询-->
           <Col span="24">
-          <Form id="search-sample-company" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+          <Form id="search-sample-company" v-show="searchOpen" :label-width="100" inline onsubmit="return false">
             <label class="label-sign"></label>
             <Form-item label="试验名称:" class="search-item">
               <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable />
             </Form-item>
+            <Form-item label="是否已添加科室:" class="search-item">
+              <Select v-model="formObj.haveGroup" clearable name="groupId" style="width:150px" placeholder="请选择是否">
+                <Option v-for="(item,index) in itemData" :value="item.value" :key="index">{{item.name}}</Option>
+              </Select>
+            </Form-item>
             <Form-item label="试验科室:" class="search-item">
               <Input v-model="formObj.groupName" @on-enter="_formSearch" placeholder="请输入试验科室" clearable />
             </Form-item>
@@ -139,6 +144,16 @@ export default {
           name: '删除'
         }
       ],
+      itemData: [
+        {
+          name: '是',
+          value: 1
+        },
+        {
+          name: '否',
+          value: 0
+        }
+      ],
       iconMsg: [{ type: 'pt-a-end', id: '', name: '删除' }],
       sampleId: '', // 样品id
       entrustId: '',
@@ -191,7 +206,8 @@ export default {
         sampleId: undefined,
         groupName: undefined,
         sampleCode: undefined,
-        entrustId: undefined
+        entrustId: undefined,
+        haveGroup: undefined
       }
     }
   },

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

@@ -76,7 +76,7 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      this.formObj.experimentId = this.id
+      this.formObj.expId = this.id
       const result = await soilTest.equipPage(this.$serializeForm(this.formObj))
       if (result) {
         console.log(result)

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

@@ -76,7 +76,7 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      this.formObj.experimentId = this.id
+      this.formObj.expId = this.id
       const result = await soilTest.equipPage(this.$serializeForm(this.formObj))
       if (result) {
         console.log(result)

pages/soil-test-manage/test-input/EquipManage.vue

@@ -76,7 +76,7 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      this.formObj.experimentId = this.id
+      this.formObj.expId = this.id
       const result = await soilTest.equipPage(this.$serializeForm(this.formObj))
       if (result) {
         console.log(result)

plugins/iframe.js

@@ -41,7 +41,7 @@ const Iframe = {
     modalDiv.className = 'record-modal'
     // 设置属性
     $(modalDiv).css({
-      'z-index': '3000',
+      'z-index': '2147483647',
       left: '0',
       top: '0',
       height: windowHeight,