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

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

@@ -705,7 +705,7 @@ export default {
     channelInputLimit(e) {
       const key = e.key
       // 不允许输入'e'和'.'
-      if (key === 'e' || key === '.') {
+      if (key === 'e') {
         e.returnValue = false
         return false
       }

pages/soil-alone-sample-instock/EntrustRegister.vue

@@ -133,7 +133,7 @@ export default {
         { title: '项目负责人', key: 'projectLeader', width: 150, detail: true },
         { title: '入库单号', key: 'instockCode', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
-        { title: '箱数', key: 'casesNum', width: 120 },
+        { title: '数量', key: 'casesNum', width: 120 },
         { title: '登记日期', key: 'registTime', width: 120, date: true }
       ]
     }

pages/soil-alone-sample-instock/EntrustRegisterEdit.vue

@@ -28,8 +28,8 @@
           <Form-item label="钻孔名称" prop="boreholeName" class="width-48">
             <Input v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入名称"/>
           </Form-item>
-          <Form-item label="箱数" prop="casesNum" class="width-48">
-            <Input v-model="formObj.casesNum" name="casesNum" placeholder="请输入箱数"/>
+          <Form-item label="数量" prop="casesNum" class="width-48">
+            <Input v-model="formObj.casesNum" name="casesNum" placeholder="请输入数量"/>
           </Form-item>
           <Form-item @click.native="_selectRegisterPerson" label="登记人" prop="registrant" class="width-48">
             <Input v-model="formObj.registrant" name="registrant" placeholder="请输入登记人"/>

pages/soil-alone-sample-instock/EntrustRegisterHis.vue

@@ -125,7 +125,7 @@ export default {
         { title: '项目名称', key: 'projectName', width: 120 },
         { title: '项目负责人', key: 'projectLeader', width: 150, detail: true },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
-        { title: '箱数', key: 'casesNum', width: 120 },
+        { title: '数量', key: 'casesNum', width: 120 },
         { title: '登记日期', key: 'registTime', width: 120, date: true }
       ]
     }

pages/soil-alone-sample-instock/ViewDetail.vue

@@ -22,7 +22,7 @@
           <tr>
             <th>钻孔名称</th>
             <td>{{obj.boreholeName}}</td>
-            <th>箱数</th>
+            <th>数量</th>
             <td>{{obj.casesNum}}</td>
           </tr>
           <tr>

pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegister.vue

@@ -136,7 +136,7 @@ export default {
         { title: '项目负责人', key: 'projectLeader', width: 150, detail: true },
         { title: '出库单号', key: 'outstockCode', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
-        { title: '箱数', key: 'casesNum', width: 120 },
+        { title: '数量', key: 'casesNum', width: 120 },
         { title: '登记日期', key: 'registTime', width: 120, date: true }
       ]
     }

pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegisterEdit.vue

@@ -28,8 +28,8 @@
           <Form-item label="钻孔名称" prop="boreholeName" class="width-48">
             <Input v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入名称"/>
           </Form-item>
-          <Form-item label="箱数" prop="casesNum" class="width-48">
-            <Input v-model="formObj.casesNum" name="casesNum" placeholder="请输入箱数"/>
+          <Form-item label="数量" prop="casesNum" class="width-48">
+            <Input v-model="formObj.casesNum" name="casesNum" placeholder="请输入数量"/>
           </Form-item>
           <Form-item @click.native="_selectRegisterPerson" label="登记人" prop="registrant" class="width-48">
             <Input v-model="formObj.registrant" name="registrant" placeholder="请输入登记人"/>

pages/soil-alone-sample-manage/soil-alone-sample-outstock/EntrustRegisterHis.vue

@@ -129,7 +129,7 @@ export default {
         { title: '项目名称', key: 'projectName', width: 120 },
         { title: '项目负责人', key: 'projectLeader', width: 150, detail: true },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
-        { title: '箱数', key: 'casesNum', width: 120 },
+        { title: '数量', key: 'casesNum', width: 120 },
         { title: '登记日期', key: 'registTime', width: 120, date: true }
       ]
     }

pages/soil-alone-sample-manage/soil-alone-sample-outstock/ViewDetail.vue

@@ -22,7 +22,7 @@
           <tr>
             <th>钻孔名称</th>
             <td>{{obj.boreholeName}}</td>
-            <th>箱数</th>
+            <th>数量</th>
             <td>{{obj.casesNum}}</td>
           </tr>
           <tr>

pages/soil-alone-sample-manage/storehouse-place-manage/ViewLocationEntrust.vue

@@ -108,7 +108,7 @@ export default {
       pageColumns: [
         { title: '项目名称', key: 'projectName', width: 140 },
         { title: '钻孔名称', key: 'boreholeName', width: 140 },
-        { title: '箱数', key: 'casesNum', width: 120 },
+        { title: '数量', key: 'casesNum', width: 120 },
         { title: '收样时间', key: 'receiveTime', width: 120, date: true },
         { title: '收样人', key: 'receiver', width: 120 },
         { title: '登记时间', key: 'registTime', width: 120, date: true },

pages/soil-alone-sample-manage/storehouse-sample-manage/stockSampleEdit.vue

@@ -23,8 +23,8 @@
           <Form-item label="钻孔名称" prop="boreholeName" class="width-48">
             <Input v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入名称"/>
           </Form-item>
-          <Form-item label="箱数" prop="casesNum" class="width-48">
-            <Input v-model="formObj.casesNum" name="casesNum" placeholder="请输入箱数"/>
+          <Form-item label="数量" prop="casesNum" class="width-48">
+            <Input v-model="formObj.casesNum" name="casesNum" placeholder="请输入数量"/>
           </Form-item>
           <Form-item @click.native="_selectRegisterPerson" label="登记人" prop="registrant" class="width-48">
             <Input v-model="formObj.registrant" name="registrant" placeholder="请输入登记人"/>

pages/soil-alone-sample/EntrustRegister.vue

@@ -138,7 +138,7 @@ export default {
         { title: '工程类型', key: 'projectType', width: 120 },
         { title: '项目类型', key: 'itemType', width: 120 },
         { title: '接收状态', key: 'receiveStatus', width: 120 },
-        { title: '箱数', key: 'casesNum', width: 120 },
+        { title: '数量', key: 'casesNum', width: 120 },
         { title: '登记日期', key: 'registTime', width: 120, date: true }
       ]
     }

pages/soil-alone-sample/EntrustRegisterEdit.vue

@@ -25,8 +25,8 @@
           <Form-item label="钻孔名称" prop="boreholeName" class="width-48">
             <Input v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入名称"/>
           </Form-item>
-          <Form-item label="箱数" prop="casesNum" class="width-48">
-            <Input v-model="formObj.casesNum" name="casesNum" placeholder="请输入箱数"/>
+          <Form-item label="数量" prop="casesNum" class="width-48">
+            <Input v-model="formObj.casesNum" name="casesNum" placeholder="请输入数量"/>
           </Form-item>
           <Form-item label="工程类型:" class="width-48">
             <Select v-model="formObj.projectType" clearable name="projectType" placeholder="请选择工程类型">

pages/soil-alone-sample/EntrustRegisterHis.vue

@@ -120,7 +120,7 @@ export default {
         { title: '工程类型', key: 'projectType', width: 120 },
         { title: '项目类型', key: 'itemType', width: 120 },
         { title: '接收状态', key: 'receiveStatus', width: 120 },
-        { title: '箱数', key: 'casesNum', width: 120 },
+        { title: '数量', key: 'casesNum', width: 120 },
         { title: '登记日期', key: 'registTime', width: 120, date: true }
       ]
     }

pages/soil-alone-sample/ViewDetail.vue

@@ -22,7 +22,7 @@
           <tr>
             <th>钻孔名称</th>
             <td>{{obj.boreholeName}}</td>
-            <th>箱数</th>
+            <th>数量</th>
             <td>{{obj.casesNum}}</td>
           </tr>
           <tr>