修改了库房样品管理

api/soil/soil-entrust.js

@@ -169,5 +169,9 @@ export default {
   bathChangeStorehouse: data =>
     http
       .post('soil/v1/alone_sample/bath_change_storehouse', data)
+      .then(res => res),
+  pageSampleOfStorehouse: data =>
+    http
+      .post('soil/v1/alone_sample/page_sample_of_storehouse', data)
       .then(res => res)
 }

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

@@ -33,10 +33,8 @@
                 v-for="item in pageColumns"
                 :key="item.key" sortable>
                 <template slot-scope="scope">
-                  <div v-if="item.key==='status'">{{scope.row[item.key]===0?'现行':scope.row[item.key]===1?'即将实施':
-                    scope.row[item.key]===2?'部分被代替':scope.row[item.key]===3?'被代替':scope.row[item.key]===4?'作废':''}}
+                  <div v-if="item.key==='status'">{{scope.row[item.key].display}}
                   </div>
-
                   <div v-else-if="item.key==='classify'">
                     {{scope.row[item.key]===0?'判定依据':scope.row[item.key]===1?'检测依据':scope.row[item.key]===2?'其他':''}}
                   </div>
@@ -168,7 +166,7 @@ export default {
             this._editModal(true, data.id)
             break
           case '查看试样':
-            this._viewSample(data.name)
+            this._viewSample(data)
             break
           case '删除':
             this._deleteById(data.id)

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

@@ -11,8 +11,8 @@
           <Col span="24">
             <Form v-show="searchOpen" id="search-sample-company" :label-width="80" inline onsubmit="return false">
               <label class="label-sign"></label>
-              <Form-item label="委托编号:" class="search-item">
-                <Input v-model="formObj.entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch" />
+              <Form-item label="钻孔名称:" class="search-item">
+                <Input v-model="formObj.boreholeName" placeholder="请输入钻孔名称" clearable @on-enter="_formSearch" />
               </Form-item>
               <Form-item class="search-btn">
                 <Button type="primary" @click="_page">
@@ -28,7 +28,7 @@
           <!-- 表格 -->
           <Col span="24">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg" select-data  @on-result-change="_tableResultChange">
+                        :get-page="getPage" select-data  @on-result-change="_tableResultChange">
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -106,20 +106,22 @@ export default {
       selectData: {},
       getPage: {},
       pageColumns: [
-        { title: '委托商', key: 'client', width: 230 },
-        { title: '委托编号', key: 'entrustCode', width: 120 },
-        { title: '委托日期', key: 'entrustDate', width: 120, date: true },
-        { title: '钻孔位置', key: 'boreholeLocation', width: 120 },
-        { title: '水深（米）', key: 'waterDepth', width: 120 },
-        { title: '钻孔名称', key: 'boreholeName', width: 120 },
-        { title: '进度', key: 'progress', width: 120, status: true },
-        { title: '平均容重', key: 'projectNo', width: 120 },
-        { title: '检验类别', key: 'testType', width: 120 }
+        { title: '项目名称', key: 'projectName', width: 140 },
+        { title: '钻孔名称', key: 'boreholeName', width: 140 },
+        { title: '箱数', key: 'casesNum', width: 120 },
+        { title: '收样时间', key: 'receiveTime', width: 120, date: true },
+        { title: '收样人', key: 'receiver', width: 120 },
+        { title: '登记时间', key: 'registTime', width: 120, date: true },
+        { title: '登记人', key: 'registrant', width: 120 },
+        { title: '入库日期', key: 'instockTime', width: 120, date: true },
+        { title: '留存日期', key: 'keepLimitTime', width: 120, date: true },
+        { title: '项目负责人', key: 'projectLeader', width: 120 }
       ],
       formObj: {
         receiveLocation: undefined,
         entrustCode: undefined,
-        client: undefined
+        client: undefined,
+        warehouse: undefined
       },
       receiveLocation: ''
     }
@@ -216,10 +218,13 @@ export default {
           break
       }
     },
-    _open(name) {
+    _open(data) {
+      console.log(data)
       this.formObj = this.$resetFields(this.formObj)
-      this.formObj.receiveLocation = name
-      this.receiveLocation = name
+      // this.formObj.receiveLocation = name
+      // this.receiveLocation = name
+      this.formObj.storehouse = data.warehouse
+      this.formObj.shelfCode = data.name
       this.showModal = true
       this.$refs.pageTable._hideLoading()
       this._page()
@@ -229,8 +234,8 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      this.formObj.entrustId = this.contractId
-      const result = await soilEntrust.pageLocationEntrust(
+      // this.formObj.entrustId = this.contractId
+      const result = await soilEntrust.pageSampleOfStorehouse(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-report-manage/report-make/tabs/SummaryInfo.vue

@@ -240,7 +240,7 @@ export default {
       if (data) {
         this.$openWindowModeless({
           objectKey: data.objectKey,
-          idType: 11,
+          idType: 12,
           id: data.id,
           isReport: 4
         })

pages/soil-report-manage/report-manage/sample-report-manage/SummaryInfo.vue

@@ -79,6 +79,8 @@ export default {
       getPage: {},
       pageColumns: [
         { title: '创建人', key: 'uname', width: 180, fixed: 'left' },
+        { title: '报告类型', key: 'reportType', width: 180 },
+        { title: '备注', key: 'remark', width: 180 },
         { title: '创建时间', key: 'ctime', width: 180, dateTime: true }
       ],
       selectIds: [],
@@ -238,7 +240,7 @@ export default {
       if (data) {
         this.$openWindowModeless({
           objectKey: data.objectKey,
-          idType: 11,
+          idType: 12,
           id: data.id,
           isReport: 4
         })

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

@@ -183,7 +183,7 @@ export default {
       if (data) {
         this.$openWindowModeless({
           objectKey: data.objectKey,
-          idType: 11,
+          idType: 13,
           id: data.id,
           isReport: 4
         })