Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev

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

@@ -6,24 +6,24 @@
         <Row>
           <!--查询-->
           <Col span="24" style="margin-top: 10px">
-            <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
+            <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item class="search-item" label="委托商:">
-                <Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
+                <Input v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-item" label="委托编号:">
-                <Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托编号" clearable/>
+                <Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"/>
               </Form-item>
               <Form-item class="search-btn">
-                <Button @click="_formSearch" type="primary">搜索</Button>
+                <Button type="primary" @click="_formSearch">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!--操作-->
           <Col span="24">
 
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
-                     class="contHide"></btn-list>
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
+                     @on-result-change="_btnClick"></btn-list>
           </Col>
           <!--表格-->
           <Col span="24">
@@ -49,7 +49,7 @@
     </div>
     <keep-alive>
       <!-- eslint-disable-next-line vue/require-component-is -->
-      <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
+      <component :is="currentComponent" ref="refModal" @on-result-change="_componentResult"></component>
     </keep-alive>
   </div>
 </template>
@@ -142,6 +142,7 @@ export default {
       pageColumns: [
         { title: '委托商', key: 'client', width: 230 },
         { title: '委托编号', key: 'entrustCode', width: 120 },
+        { title: '进度', key: 'progress', width: 120, status: true },
         { title: '委托日期', key: 'entrustDate', width: 120, date: true },
         { title: '项目名称', key: 'projectName', width: 120 },
         { title: '钻孔位置', key: 'boreholeLocation', width: 120 },

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

@@ -4,7 +4,7 @@
       <p slot="header">{{modalTitle}}</p>
       <div>
         <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100" inline>
-          <Form-item label="收样位置" prop="name" style="width: 100%">
+          <Form-item label="留存位置" prop="name" style="width: 100%">
             <el-select v-model="formObj.locationId"  @change="selectLocation($event)" name="locationId">
               <el-option v-for="(item) in options" :label="item.name" :key="item.id" :value="item.id">
                 {{ item.name }}
@@ -33,12 +33,6 @@ export default {
   data() {
     return {
       formId: '',
-      lengthLimitList: [
-        { key: 'stdNum', title: '标准号' },
-        { key: 'enName', title: '英文名称' },
-        { key: 'belongUnit', title: '归口单位' },
-        { key: 'publishUnit', title: '发布单位' }
-      ],
       modalTitle: '留存位置选择',
       formObj: {
         receiveLocation: '',
@@ -48,24 +42,6 @@ export default {
       showEditModal: false,
       ids: '',
       options: [],
-      classifyList: [
-        { value: 0, name: '判定依据' },
-        { value: 1, name: '检测依据' },
-        { value: 2, name: '其他' }
-      ],
-      typeList: [
-        { value: 0, name: '国家标准' },
-        { value: 1, name: '地方标准' },
-        { value: 2, name: '行业标准' },
-        { value: 3, name: '企业标准' }
-      ],
-      statusList: [
-        { value: 0, name: '现行' },
-        { value: 1, name: '即将实施' },
-        { value: 2, name: '部分被代替' },
-        { value: 3, name: '被代替' },
-        { value: 4, name: '作废' }
-      ],
       footerList: [
         { id: '', name: '取消', type: '' },
         { id: '', name: '保存', type: 'primary' }
@@ -120,12 +96,6 @@ export default {
         this._resultChange('添加成功!')
       }
     },
-    _edit: async function(data) {
-      const result = await soilAptitude.standardEdit(data)
-      if (result) {
-        this._resultChange('编辑成功!')
-      }
-    },
     _cancel() {
       this._hideLoading()
       this.showEditModal = false
@@ -152,15 +122,6 @@ export default {
         this.formObj.receiveLocation = result.name
       }
       console.log(this.formObj.receiveLocation)
-    },
-    _registerAdd() {
-      this.formId = this.$randomCode()
-      this._hideLoading()
-      this.$refs.formObj.resetFields()
-      this.modalTitle = '添加'
-      this.formObj.id = ''
-      this.formObj.type = 3
-      this.showEditModal = true
     }
   }
 }