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

pages/meter-aptitude/standard-manage/StandardsManageEdit.vue

@@ -70,7 +70,10 @@ export default {
         { key: 'publishUnit', title: '发布单位' }
       ],
       modalTitle: '添加食品标准表',
-      formObj: {},
+      formObj: {
+        code: '',
+        name: ''
+      },
       ruleValidate: {
         code: [
           { required: true, message: '检测依据不能为空', trigger: 'blur' }

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

@@ -28,6 +28,9 @@
           <Form-item label="水深（米）" prop="waterDepth" class="width-48">
             <Input v-model="formObj.waterDepth" name="waterDepth" placeholder="请输入深度"/>
           </Form-item>
+          <Form-item label="工程号" prop="projectNo" class="width-48">
+            <Input v-model="formObj.projectNo" name="projectNo" placeholder="请输入工程号"/>
+          </Form-item>
           <Form-item label="制单日期：" prop="tabulateDate" class="width-48">
             <Date-picker v-model="formObj.tabulateDate" @on-change="_tabulateChange" name="tabulateDate" type="date" split-panels style="width:100%;"
                          placeholder="请选择委托日期"></Date-picker>
@@ -147,6 +150,20 @@ export default {
         callback()
       }
     }
+    const validboreholeLocation = (rule, value, callback) => {
+      if (this.formObj.boreholeLocation === '') {
+        callback(new Error('钻孔位置不能为空'))
+      } else {
+        callback()
+      }
+    }
+    const validboreholeName = (rule, value, callback) => {
+      if (this.formObj.boreholeName === '') {
+        callback(new Error('钻孔名称不能为空'))
+      } else {
+        callback()
+      }
+    }
     const validateRemark = (rule, value, callback) => {
       if (this.testedCityData.length === 0) {
         callback(new Error('内容不能为空'))
@@ -251,6 +268,7 @@ export default {
         boreholeName: [
           {
             required: true,
+            validator: validboreholeName,
             message: '钻孔名称不能为空',
             trigger: 'blur'
           }
@@ -258,6 +276,7 @@ export default {
         boreholeLocation: [
           {
             required: true,
+            validator: validboreholeLocation,
             message: '钻孔位置不能为空',
             trigger: 'blur'
           }

pages/soil-sample-manage/sample-receive/ItemManage.vue

@@ -23,13 +23,6 @@
           <!--操作-->
           <Col span="24">
             <btn-list :msg="btn" @on-result-change="_btnClick" :show-search-btn="true" class="contHide">
-              <template slot="processTask">
-                <div class="fr process-task">
-                  <el-checkbox v-model="formObj.onlyAbort" @change="_page" :true-label="1"
-                               :false-label="0" size="medium">查看终止项目
-                  </el-checkbox>
-                </div>
-              </template>
             </btn-list>
           </Col>
           <!-- 表格 -->

pages/soil-sample-manage/sample-receive/SampleReceiveIndex.vue

@@ -6,7 +6,7 @@
           <el-tab-pane label="按委托接收" name="entrust">
             <ReceiveByEntrust ref="entrustTabs"></ReceiveByEntrust>
           </el-tab-pane>
-          <el-tab-pane label="按样品接收" name="sample">
+          <el-tab-pane label="接收历史" name="sample">
             <ReceiveBySample ref="sampleTabs"></ReceiveBySample>
           </el-tab-pane>
         </el-tabs>

pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceive.vue

@@ -34,6 +34,7 @@
             :tableHeight="tableHeight"
             @on-result-change="_tableResultChange"
             :getPage="getPage"
+            :iconMsg="iconMsg"
             select-data>
             <vxe-table-column
               v-for="item in pageColumns"
@@ -59,14 +60,15 @@
     </div>
     <!--选择领样人-->
     <SampleReceiveModal ref="locationModal" @on-result-change="_page()"></SampleReceiveModal>
+    <SoilSampleItemManage ref="sampleItemManage" @on-result-change="_page"></SoilSampleItemManage>
   </div>
 </template>
 <script>
 import { soilEntrust } from '../../../../api'
 import SampleReceiveModal from '../SampleReceiveModal'
-
+import SoilSampleItemManage from './SoilSampleItemManage'
 export default {
-  components: { SampleReceiveModal },
+  components: { SampleReceiveModal, SoilSampleItemManage },
   data() {
     return {
       btn: [{ type: 'primary', id: '', name: '收样室收样' }],
@@ -79,17 +81,7 @@ export default {
         { title: '样品包装类型', key: 'samplePack', width: 160 },
         { title: '现场编号', key: 'siteNo', width: 130 }
       ],
-      iconMsg: [
-        { type: 'md-create', id: '', name: '编辑' },
-        { type: 'md-trash', id: '', name: '删除' },
-        {
-          type: 'ios-clock',
-          id: '',
-          name: '操作日志',
-          componentName: 'SampleRecord'
-        },
-        { type: 'md-cloud', id: '', name: '附件', componentName: 'FileManage' }
-      ],
+      iconMsg: [{ type: 'ios-list', id: '', name: '试验项目' }],
       type: '',
       contractId: '', // 合同id
       selectData: [],
@@ -225,6 +217,9 @@ export default {
           case '编辑':
             this._editModal(true, data)
             break
+          case '试验项目':
+            this._itemManage(data.id)
+            break
           case '复制':
             this._copySample(data)
             break
@@ -240,6 +235,14 @@ export default {
         }
       })
     },
+    _itemManage(data) {
+      // 管理检测项目
+      if (this.recordHis) {
+        this.$refs.sampleItemManage._openRecord(data)
+      } else {
+        this.$refs.sampleItemManage._open(data)
+      }
+    },
     _btnClick(msg, currentComponent) {
       this.currentComponent = currentComponent
       this.$nextTick(() => {

pages/soil-sample-manage/sample-take/ItemManage.vue

@@ -23,13 +23,6 @@
           <!--操作-->
           <Col span="24">
             <btn-list :msg="btn" @on-result-change="_btnClick" :show-search-btn="true" class="contHide">
-              <template slot="processTask">
-                <div class="fr process-task">
-                  <el-checkbox v-model="formObj.onlyAbort" @change="_page" :true-label="1"
-                               :false-label="0" size="medium">查看终止项目
-                  </el-checkbox>
-                </div>
-              </template>
             </btn-list>
           </Col>
           <!-- 表格 -->