修改了工程号

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

@@ -158,7 +158,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        { title: '工程号', key: 'projectNo', width: 120 },
+        { title: '平均容重', key: 'projectNo', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },
         { title: '批准日期', key: 'approveDate', width: 120, date: true },

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

@@ -28,8 +28,8 @@
           <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 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%;"

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

@@ -100,7 +100,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        { title: '工程号', key: 'projectNo', width: 120 },
+        { title: '平均容重', key: 'projectNo', width: 120 },
         { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },

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

@@ -118,7 +118,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        { title: '工程号', key: 'projectNo', width: 120 },
+        { title: '平均容重', key: 'projectNo', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },
         { title: '批准日期', key: 'approveDate', width: 120, date: true },

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

@@ -145,7 +145,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        // { title: '工程号', key: 'projectNo', width: 120 },
+        // { title: '平均容重', key: 'projectNo', width: 120 },
         // { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },

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

@@ -114,7 +114,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        { title: '工程号', key: 'projectNo', width: 120 },
+        { title: '平均容重', key: 'projectNo', width: 120 },
         { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },

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

@@ -103,7 +103,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        { title: '工程号', key: 'projectNo', width: 120 },
+        { title: '平均容重', key: 'projectNo', width: 120 },
         { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },

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

@@ -106,7 +106,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        { title: '工程号', key: 'projectNo', width: 120 },
+        { title: '平均容重', key: 'projectNo', width: 120 },
         { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },

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

@@ -71,7 +71,9 @@ export default {
       const result = await soilSample.scanTakeSample(this.num)
       if (result) {
         console.log(result)
-        // this._resultChange(' 发放')
+        this.num = ''
+        this.$Message.success('领样成功')
+        // this._resultChange(' 领样')
       }
       // this.$store
       //   .dispatch('FoodSample/scanSend', this.$serializeFormSearch(param))

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

@@ -146,7 +146,7 @@ export default {
       searchOpen: false,
       btn: [
         { type: 'primary', id: '', name: '领样', componentName: '' },
-        { type: 'primary', id: '', name: '扫码接收', componentName: '' }
+        { type: 'primary', id: '', name: '扫码领样', componentName: '' }
       ],
       selectIds: [],
       selectData: [],
@@ -212,7 +212,7 @@ export default {
           case '领样':
             this._sampleTake()
             break
-          case '扫码接收':
+          case '扫码领样':
             this._ewmTake()
             break
           default:

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

@@ -108,7 +108,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        // { title: '工程号', key: 'projectNo', width: 120 },
+        // { title: '平均容重', key: 'projectNo', width: 120 },
         // { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },

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

@@ -108,7 +108,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        { title: '工程号', key: 'projectNo', width: 120 },
+        { title: '平均容重', key: 'projectNo', width: 120 },
         { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },

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

@@ -108,7 +108,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        // { title: '工程号', key: 'projectNo', width: 120 },
+        // { title: '平均容重', key: 'projectNo', width: 120 },
         // { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },

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

@@ -108,7 +108,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        { title: '工程号', key: 'projectNo', width: 120 },
+        { title: '平均容重', key: 'projectNo', width: 120 },
         { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },

pages/soil-test-manage/test-data-consult/DataConsult.vue

@@ -108,7 +108,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        // { title: '工程号', key: 'projectNo', width: 120 },
+        // { title: '平均容重', key: 'projectNo', width: 120 },
         // { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },

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

@@ -108,7 +108,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        // { title: '工程号', key: 'projectNo', width: 120 },
+        // { title: '平均容重', key: 'projectNo', width: 120 },
         // { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },

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

@@ -108,7 +108,7 @@ export default {
         { title: '水深（米）', key: 'waterDepth', width: 120 },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
         { title: '进度', key: 'progress', width: 120, status: true },
-        { title: '工程号', key: 'projectNo', width: 120 },
+        { title: '平均容重', key: 'projectNo', width: 120 },
         { title: '报告编号', key: 'reportCode', width: 120 },
         { title: '制表日期', key: 'tabulateDate', width: 120, date: true },
         { title: '制表人', key: 'tabulater', width: 120 },