修改收样室收样页面和开土制备页面

api/soil/soil-entrust.js

@@ -52,5 +52,11 @@ export default {
   sendSample: data =>
     http.post('soil/v1/sample/send_sample', data).then(res => res),
   pagePrepare: data =>
-    http.post('soil/v1/sample/page_prepare', data).then(res => res)
+    http.post('soil/v1/sample/page_prepare', data).then(res => res),
+  sampleEdit: data =>
+    http.put(
+      'soil/v1/sample/' + data.id + '?describeDetail=' + data.describeDetail
+    ),
+  weiteSoilDetail: data =>
+    http.post('soil/v1/sample/write_soil_detail', data).then(res => res)
 }

pages/soil-sample-manage/SoilSampleManage.vue

@@ -43,7 +43,7 @@
           <!-- 表格 -->
           <Col span="24">
             <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg"  @on-result-change="_tableResultChange">
+                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange"  select-data>
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -61,6 +61,9 @@
                 <div v-else-if="item.date">
                   {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):'' }}
                 </div>
+                <div v-else-if="item.key==='describeDetail'" @click.stop="_handleRow(scope)">
+                  <el-input v-model="scope.row.describeDetail" @change="_inputChange(scope.row)"></el-input>
+                </div>
                 <div v-else>
                   {{ scope.row[item.key] }}
                 </div>
@@ -75,6 +78,7 @@
       </div>
     </Modal>
     <SoilSampleItemManage ref="sampleItemManage" @on-result-change="_page"></SoilSampleItemManage>
+    <DescribeDetailModal ref="writeDetailModal" @on-result-change="_page"></DescribeDetailModal>
   </div>
 </template>
 <script>
@@ -82,9 +86,10 @@ import http from '../../api/http'
 import { soilEntrust } from '../../api'
 import { getLodop } from '../../plugins/clodop/LodopFuncs'
 import SoilSampleItemManage from './SoilSampleItemManage'
+import DescribeDetailModal from './sample-preparation/DescribeDetailModal'
 let LODOP
 export default {
-  components: { SoilSampleItemManage },
+  components: { SoilSampleItemManage, DescribeDetailModal },
   data() {
     return {
       formId: 'soilSampleManage',
@@ -104,6 +109,11 @@ export default {
           type: 'success',
           id: '',
           name: '打印标签'
+        },
+        {
+          type: 'success',
+          id: '',
+          name: '批量填写土质描述详情'
         }
       ],
       itemList: [],
@@ -131,6 +141,7 @@ export default {
       pageColumns: [
         { title: '试样编号', key: 'sampleCode', width: 160, fixed: 'left' },
         { title: '试样深度', key: 'sampleDepth', width: 160 },
+        { title: '土质描述详情', key: 'describeDetail', width: 160 },
         { title: '土质描述', key: 'sampleDescribe', width: 160 },
         { title: '样品包装类型', key: 'samplePack', width: 160 },
         { title: '现场编号', key: 'siteNo', width: 130 }
@@ -149,6 +160,19 @@ export default {
     }
   },
   methods: {
+    _inputChange: async function(info) {
+      const result = await soilEntrust.sampleEdit({
+        id: info.id,
+        describeDetail: info.describeDetail
+      })
+      if (result) {
+        this._resultChange('修改成功')
+      }
+    },
+    _handleRow(data) {
+      this.currentRow = data.row
+      this.currentIndex = data.rowIndex
+    },
     _footerResult(name) {
       switch (name) {
         case '取消':
@@ -224,6 +248,9 @@ export default {
           case '打印标签':
             this._printLabel()
             break
+          case '批量填写土质描述详情':
+            this._writeDetail(this.selectIds)
+            break
           case '复制历史样品检测项目':
             this._copyHisItem()
             break
@@ -242,6 +269,14 @@ export default {
         }
       })
     },
+    _writeDetail(id) {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选中一条样品数据！')
+      } else {
+        const ids = id.join(',')
+        this.$refs.writeDetailModal._open(ids)
+      }
+    },
     _exportSample() {
       if (this.selectIds.length === 0) {
         this.$Message.warning('请至少选择一条样品')
@@ -414,8 +449,8 @@ export default {
       this._page()
     },
     _resultChange(msg) {
-      this._page()
       this.$Message.success(msg)
+      this._page()
     },
     _copy(data) {
       this.$refs.copyModal._open(data.id, data.type)

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

+<template>
+  <div>
+    <Modal v-model="showEditModal" :mask-closable="false" :width="500" class="zIndex-1200">
+      <p slot="header">{{modalTitle}}</p>
+      <div>
+        <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100" inline>
+          <Form-item label="土质描述详情" prop="detail " style="width: 100%">
+            <el-input v-model="formObj.detail " name="detail "></el-input>
+          </Form-item>
+        </Form>
+      </div>
+      <div slot="footer">
+        <ModalFooter ref="footerModal" @on-result-change="_footerResult" :footer="footerList"></ModalFooter>
+      </div>
+    </Modal>
+  </div>
+</template>
+<script>
+/**
+ * 添加编辑
+ */
+import ModalFooter from '../../../components/base/modalFooter'
+import { soilAptitude, soilEntrust, soilSample } from '../../../api'
+
+export default {
+  components: {
+    ModalFooter
+  },
+  data() {
+    return {
+      formId: '',
+      lengthLimitList: [
+        { key: 'stdNum', title: '标准号' },
+        { key: 'enName', title: '英文名称' },
+        { key: 'belongUnit', title: '归口单位' },
+        { key: 'publishUnit', title: '发布单位' }
+      ],
+      modalTitle: '添加食品标准表',
+      formObj: {
+        detail: ''
+      },
+      ruleValidate: {},
+      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' }
+      ]
+    }
+  },
+  methods: {
+    /** *modal-footer */
+    selectLocation(data) {
+      this._getLocationById(data)
+    },
+    _footerResult(name) {
+      switch (name) {
+        case '取消':
+          this._cancel()
+          break
+        case '保存':
+          this._ok()
+          break
+      }
+    },
+    _hideLoading() {
+      this.$refs.footerModal._hideLoading()
+    },
+    _resultChange(msg) {
+      this.showEditModal = false
+      this.$Message.success(msg)
+      this.$emit('on-result-change')
+      this._hideLoading()
+    },
+    _ok() {
+      this.$refs.formObj.validate(valid => {
+        if (valid) {
+          this.formObj.ids = this.ids
+          this._receive(this.formObj)
+        } else {
+          this.$Message.error('表单验证失败!')
+          this._hideLoading()
+        }
+      })
+    },
+    _receive: async function(data) {
+      const result = await soilEntrust.weiteSoilDetail(data)
+      if (result) {
+        this._resultChange('填写成功!')
+      }
+    },
+    _save: async function(data) {
+      const result = await soilAptitude.standardSave(data)
+      if (result) {
+        this._resultChange('添加成功!')
+      }
+    },
+    _edit: async function(data) {
+      const result = await soilAptitude.standardEdit(data)
+      if (result) {
+        this._resultChange('编辑成功!')
+      }
+    },
+    _cancel() {
+      this._hideLoading()
+      this.showEditModal = false
+    },
+    _open(ids) {
+      this.formObj.detail = ''
+      this.ids = ids
+      this.showEditModal = true
+    },
+    _getLocation: async function() {
+      const result = await soilSample.locationList()
+      if (result) {
+        console.log(result)
+        this.options = result
+        console.log(this.options)
+      }
+    },
+    _getLocationById: async function(id) {
+      console.log(id)
+      const result = await soilSample.locationGetById(id)
+      if (result) {
+        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
+    }
+  }
+}
+</script>

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

@@ -100,6 +100,11 @@ export default {
         //   name: '管理样品'
         // },
         {
+          type: 'ios-camera-outline',
+          id: '',
+          name: '试样照片'
+        },
+        {
           type: 'md-cloud',
           id: '',
           name: '附件'
@@ -187,6 +192,9 @@ export default {
           case '试样列表':
             this._sampleManage(data.id)
             break
+          case '试样照片':
+            this._upload(data.id)
+            break
           case '附件':
             this._upload(data.id)
             break