修改了试验室领样

api/soil/soil-sample.js

@@ -18,5 +18,8 @@ export default {
   locationDeleteById: data =>
     http.delete('soil/v1/receive_location/?ids=' + data).then(res => res),
   locationEdit: data =>
-    http.put('soil/v1/receive_location/' + data.id, data.obj).then(res => res)
+    http.put('soil/v1/receive_location/' + data.id, data.obj).then(res => res),
+  // 试验室领样操作
+  takeSample: data =>
+    http.post('soil/v1/sample/take_sample?ids=' + data).then(res => res)
 }

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

@@ -311,6 +311,7 @@ export default {
       console.log(this.getPage.records)
     },
     _cusNameChange(msg, data) {
+      console.log('选择')
       // this.financeObj = {} // 清空维护发票信息的数据
       if (this.$string(this.id).isEmpty()) {
         // 添加的时候选择单位
@@ -763,7 +764,7 @@ export default {
     _getQueryList: async function(data) {
       const result = await meterEntrust.pageQueryList(data)
       if (result) {
-        console.log(result)
+        console.log('委托商', result)
       }
     },
     _save: async function(data) {

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

@@ -55,10 +55,17 @@
                                 @on-result-change="_packSaveChange" clearable
                                 placeholder="输入或选择保存容器" show-key="name"></AutoComplete>
                 </div>
-<!--                <div v-else-if="item.key==='prepareDate'">-->
-<!--                  <Date-picker v-model="scope.row.prepareDate" type="date" style="width:100%;"-->
-<!--                               placeholder="请选择日期"></Date-picker>-->
+<!--                <div v-else-if="item.key==='prepareDate'" @click="_handleTimeRow(scope)">-->
+<!--                  <el-date-picker-->
+<!--                    v-model="scope.row.prepareDate"-->
+<!--                    type="datetime"-->
+<!--                    placeholder="选择日期时间">-->
+<!--                  </el-date-picker>-->
 <!--                </div>-->
+                <div v-else-if="item.key==='prepareDate'">
+                  <Date-picker v-model="scope.row.prepareDate" type="date" format="yyyy-MM-dd HH:mm" style="width:100%;"
+                               placeholder="请选择日期"></Date-picker>
+                </div>
 <!--                <div v-else-if="item.key==='prepareDate' && isAccurate === '是'" @click="_handleRow(scope)">-->
 <!--                  <date-picker :editable="false" :transfer="true" v-model="scope.row.prepareDate" type="datetime"-->
 <!--                              placeholder="选择时间"-->
@@ -96,27 +103,30 @@
               <!--只读模板-->
               <template v-slot="scope">
 
-                <div v-if="item.key==='prepareDate' && isAccurate === '是'">
-                  <div>
-                    {{scope.row.prepareDate?$dateformat(scope.row.preparationDate,'yyyy-mm-dd HH:MM'):''}}
-                  </div>
-                </div>
-                <div v-else-if="item.key==='prepareDate' && isAccurate === '否'">
-                  <div>
-                    {{scope.row.prepareDate?$dateformat(scope.row.preparationDate,'yyyy-mm-dd'):''}}
-                  </div>
-                </div>
-                <div v-else-if="item.key==='prepareDate' && !isAccurate">
-                  <div>
-                    {{scope.row.prepareDate?$dateformat(scope.row.preparationDate,'yyyy-mm-dd'):''}}
-                  </div>
-                </div>
-                <div v-else-if="item.key==='num'">
+<!--                <div v-if="item.key==='prepareDate' && isAccurate === '是'">-->
+<!--                  <div>-->
+<!--                    {{scope.row.prepareDate?$dateformat(scope.row.preparationDate,'yyyy-mm-dd HH:MM'):''}}-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--                <div v-else-if="item.key==='prepareDate' && isAccurate === '否'">-->
+<!--                  <div>-->
+<!--                    {{scope.row.prepareDate?$dateformat(scope.row.preparationDate,'yyyy-mm-dd'):''}}-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--                <div v-else-if="item.key==='prepareDate' && !isAccurate">-->
+<!--                  <div>-->
+<!--                    {{scope.row.prepareDate?$dateformat(scope.row.preparationDate,'yyyy-mm-dd'):''}}-->
+<!--                  </div>-->
+<!--                </div>-->
+                <div v-if="item.key==='num'">
                   <div v-if="scope.row.itemPreparation===0">{{scope.row[item.key]}}</div>
                   <div v-else-if="scope.row.itemPreparation===1" class="red-color">
                     {{scope.row[item.key]}}
                   </div>
                 </div>
+                <div v-else-if="item.key==='prepareDate'">
+                  {{scope.row.prepareDate?$dateformat(scope.row.preparationDate,'yyyy-mm-dd HH:MM'):''}}
+                </div>
                 <span v-else-if="item.key==='type'">{{ scope.row[item.key]===0? '检样':'备样' }}</span>
                 <span v-else-if="item.key==='status'">{{ scope.row[item.key].display }}</span>
                 <div v-else>{{scope.row[item.key]}}</div>
@@ -330,6 +340,11 @@ export default {
         console.log(result)
         this.$refs.pageTable._hideLoading()
         this.getPage.records = result
+        for (let j = 0; j < result.length; j++) {
+          console.log(result[j].prepareDate)
+          console.log(new Date(result[j].prepareDate))
+          this.getPage.records[j].prepareDate = new Date(result[j].prepareDate)
+        }
       }
     },
     _footerResult(name) {
@@ -416,6 +431,13 @@ export default {
     save: async function(data) {
       const result = await soilEntrust.savePrepare(data)
       console.log(result)
+      this._resultChange('制备成功')
+    },
+    _resultChange(msg) {
+      this.showModal = false
+      this.$Message.success(msg)
+      this.$emit('on-result-change')
+      this._hideLoading()
     },
     _hideLoading() {
       this.$refs.footerModal._hideLoading()
@@ -599,6 +621,10 @@ export default {
     // 操作的序号
     _handleRow(data) {
       this.currentRow = data.row
+    },
+    _handleTimeRow(data) {
+      console.log(this.currentRow)
+      this.currentRow = data.row
     }
   }
 }

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

@@ -3,10 +3,10 @@
     <div class="layout-content-padding">
       <div class="layout-content-main">
         <el-tabs v-model="activeName" @tab-click="_changeTabs">
-          <el-tab-pane label="按委托接收" name="entrust">
+          <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-take/TakeBySample.vue

@@ -33,7 +33,6 @@
               :tableHeight="tableHeight"
               @on-result-change="_tableResultChange"
               :getPage="getPage"
-              :icon-msg="iconMsg"
               select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
@@ -69,7 +68,7 @@
 <script>
 import http from '../../../api/http'
 import UserInfo from '../../../components/user-info-single/AssignPerson'
-import { soilEntrust } from '../../../api'
+import { soilEntrust, soilSample } from '../../../api'
 
 export default {
   components: {
@@ -146,9 +145,7 @@ export default {
         { title: '单位', key: 'unit', width: 130 }
       ],
       searchOpen: false,
-      btn: [
-        { type: 'primary', id: 'ZBC', name: '接收并发放', componentName: '' }
-      ],
+      btn: [{ type: 'primary', id: '', name: '领样', componentName: '' }],
       selectIds: [],
       selectData: [],
       currentComponent: '',
@@ -218,6 +215,9 @@ export default {
           case 'search':
             this.searchOpen = !this.searchOpen
             break
+          case '领样':
+            this._sampleTake()
+            break
           default:
             this._btnOption(msg, formTypeObj)
         }
@@ -273,6 +273,25 @@ export default {
           break
       }
     },
+    _sampleTake() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this.$Modal.confirm({
+          title: '提示',
+          content: '确认领样',
+          onOk: () => {
+            this._confirmTake(this.selectIds.join(','))
+          }
+        })
+      }
+    },
+    _confirmTake: async function(ids) {
+      const result = await soilSample.takeSample(ids)
+      if (result) {
+        this._resultChange('领样成功')
+      }
+    },
     // 1.自定义打印，除检样、备样、留样 增加制备标签，需要单独的查询制备标签的数据，
     // 2.样品接收位置的制备用制备的的接口，将当前的保存方式置空，打印出来手动填写
     _cusTomePrint() {
@@ -695,11 +714,9 @@ export default {
       this.$refs.refModal._open(id)
     },
     _resultChange(msg) {
-      if (this.$store.state.FoodContract.success) {
       this._page()
       this.$Message.success(msg)
       this.selectIds = []
-      }
     },
     _resultSampleChange(msg) {
       if (this.$store.state.FoodSample.success) {