修改收样位置管理页面

api/index.js

@@ -28,3 +28,4 @@ export { default as meterEntrust } from './meter/meter-entrust'
 export { default as meterSample } from './meter/meter-sample'
 export { default as soilAptitude } from './soil/soil-aptitude'
 export { default as soilEntrust } from './soil/soil-entrust'
+export { default as soilSample } from './soil/soil-sample'

api/soil/soil-entrust.js

@@ -40,5 +40,7 @@ export default {
       .then(res => res),
   reviewPass: data =>
     http.post('soil/v1/entrust/review_pass?ids=' + data).then(res => res),
-  samplePage: data => http.post('soil/v1/sample/page', data).then(res => res)
+  samplePage: data => http.post('soil/v1/sample/page', data).then(res => res),
+  pageReceive: data =>
+    http.post('soil/v1/sample/page_receive', data).then(res => res)
 }

api/soil/soil-sample.js

+/**
+ * 工作台
+ */
+
+import http from '../http'
+// import { https } from '../https'
+
+export default {
+  // page
+  locationPage: data =>
+    http.post('soil/v1/receive_location/page', data).then(res => res),
+  locationGetById: data =>
+    http.get('soil/v1/receive_location/' + data).then(res => res),
+  locationSave: data =>
+    http.post('soil/v1/receive_location/', data).then(res => res),
+  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)
+}

pages/soil-sample-manage/SoilSampleItemManage.vue

@@ -119,6 +119,7 @@ export default {
   components: {},
   data() {
     return {
+      formId: 'SoilSampleItemManage',
       currentComponent: '',
       btn: [
         { type: 'success', id: '', name: '提交分包' },

pages/soil-sample-manage/sample-address/AddressManageEdit.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="code" style="width: 100%">
+            <Input v-model="formObj.code" name="code" placeholder="请输入位置编号"/>
+          </Form-item>
+          <Form-item label="收样存储位置" prop="name" style="width: 100%">
+            <Input v-model="formObj.name" name="name" placeholder="请输入收样存储位置"/>
+          </Form-item>
+          <Form-item label="位置分类" prop="type" style="width: 100%">
+              <Select v-model="formObj.type" name="type">
+                <Option v-for="(item,index) in options" :key="item.name" :value="index">
+                  {{ item.name }}
+                </Option>
+              </Select>
+          </Form-item>
+          <Form-item label="位置管理人" prop="manager" style="width: 100%">
+            <Input v-model="formObj.manager" @click.native="_selectStaff" name="manager" readonly/>
+          </Form-item>
+          <Form-item prop="managerId" style="width: 100%;display: none">
+            <Input v-model="formObj.managerId" @click.native="_selectStaff" name="managerId" readonly/>
+          </Form-item>
+          <Form-item label="备注说明" prop="remark" style="width: 100%">
+            <Input v-model="formObj.remark" name="remark" placeholder="请输入备注说明"/>
+          </Form-item>
+        </Form>
+      </div>
+      <div slot="footer">
+        <ModalFooter ref="footerModal" @on-result-change="_footerResult" :footer="footerList"></ModalFooter>
+      </div>
+    </Modal>
+    <UserInfo ref="userModal" @on-result-change="_userData" is-change></UserInfo>
+  </div>
+</template>
+<script>
+/**
+ * 添加编辑
+ */
+import ModalFooter from '../../../components/base/modalFooter'
+import { soilSample } from '../../../api'
+import Global from '../../../api/config'
+import UserInfo from '../../../components/user-info-single/AssignPerson'
+
+export default {
+  components: {
+    ModalFooter,
+    UserInfo
+  },
+  data() {
+    return {
+      formId: '',
+      lengthLimitList: [
+        { key: 'stdNum', title: '标准号' },
+        { key: 'enName', title: '英文名称' },
+        { key: 'belongUnit', title: '归口单位' },
+        { key: 'publishUnit', title: '发布单位' }
+      ],
+      modalTitle: '添加食品标准表',
+      formObj: {
+        name: '',
+        code: '',
+        type: '',
+        remark: '',
+        manager: '',
+        managerId: ''
+      },
+      options: [
+        {
+          name: '国家标准'
+        },
+        {
+          name: '地方标准'
+        },
+        {
+          name: '行业标准'
+        },
+        {
+          name: '企业标准'
+        }
+      ],
+      ruleValidate: {
+        code: [
+          { required: true, message: '检测依据不能为空', trigger: 'blur' }
+        ],
+        name: [
+          { required: true, message: '检测依据名称不能为空', trigger: 'blur' }
+        ]
+      },
+      showEditModal: false,
+      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: {
+    _getUser() {
+      const user = Global.getUserInfo()
+      this.formObj.manager = user.realname
+      this.formObj.managerId = user.id
+      console.log(user)
+    },
+    _selectStaff() {
+      this.$refs.userModal._open()
+    },
+    _userData(data, msg, contractTempData) {
+      console.log(data, msg)
+    },
+    /** *modal-footer */
+    _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) {
+          if (this.formObj.publishDate && this.formObj.effectDate) {
+            if (this.formObj.publishDate > this.formObj.effectDate) {
+              this.$Message.error('发布日期应早于实施日期')
+              this._hideLoading()
+              return
+            }
+          }
+          const data = this.$serialize('edit-form')
+          if (this.$string(this.formObj.id).isEmpty()) {
+            // 添加
+            this._save(data)
+          } else {
+            // 编辑
+            this._edit({ id: this.formObj.id, obj: data })
+          }
+        } else {
+          this.$Message.error('表单验证失败!')
+          this._hideLoading()
+        }
+      })
+    },
+    _save: async function(data) {
+      const result = await soilSample.locationSave(data)
+      if (result) {
+        this._resultChange('添加成功!')
+      }
+    },
+    _edit: async function(data) {
+      const result = await soilSample.locationEdit(data)
+      if (result) {
+        this._resultChange('编辑成功!')
+      }
+    },
+    _cancel() {
+      this._hideLoading()
+      this.showEditModal = false
+    },
+    _open(formObj) {
+      this.formId = this.$randomCode()
+      this._hideLoading()
+      this.$refs.formObj.resetFields()
+      if (this.$string(formObj).isEmpty()) {
+        this.modalTitle = '添加'
+        this.formObj.id = ''
+        this._getUser()
+      } else {
+        this.formObj = formObj
+        this.formObj.id = formObj.id
+        this.formObj.effectDate = this.formObj.effectDate
+          ? new Date(formObj.effectDate)
+          : ''
+        this.formObj.publishDate = this.formObj.publishDate
+          ? new Date(formObj.publishDate)
+          : ''
+        this.modalTitle = '编辑'
+      }
+      this.showEditModal = true
+    },
+    _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-receive/ReceiveBySample.vue

@@ -666,7 +666,9 @@ export default {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log(this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await soilEntrust.page(this.$serializeForm(this.formObj))
+      const result = await soilEntrust.pageReceive(
+        this.$serializeForm(this.formObj)
+      )
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result

pages/soil-sample-manage/sample-receive/entrust-sample-manage/WaitReceive.vue

@@ -68,7 +68,7 @@ export default {
   components: {},
   data() {
     return {
-      btn: [{ type: 'primary', id: 'wait-receive-receive', name: '接收' }],
+      btn: [{ type: 'primary', id: '', name: '收样室收样' }],
       selectIds: [],
       getPage: {},
       pageColumns: [
@@ -214,7 +214,7 @@ export default {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
       this.formObj.entrustId = this.entrustId
-      const result = await soilEntrust.samplePage(
+      const result = await soilEntrust.pageReceive(
         this.$serializeForm(this.formObj)
       )
       if (result) {
@@ -277,7 +277,7 @@ export default {
           case '复制历史样品检测项目':
             this._copyHisItem()
             break
-          case '接收':
+          case '收样室收样':
             this._sampleReceive()
             break
           case '打印标签':
@@ -526,15 +526,7 @@ export default {
           title: '提示',
           content: '确定要接收这 ' + this.selectIds.length + ' 条数据？',
           onOk: () => {
-            this.$store
-              .dispatch('FoodSample/batchSaveReceive', tempData)
-              .then(() => {
-                if (this.$store.state.FoodSample.success) {
-                  this.$Message.success('提交成功！')
-                  this.selectData = []
-                  this._searchTop()
-                }
-              })
+            console.log(tempData)
           }
         })
       }

router/soil-routes.js

@@ -9,6 +9,7 @@ import EntrustIndex from '../pages/meter-entrust/entrust-register/EntrustIndex'
 import ReviewEntrust from '../pages/meter-entrust/entrust-review/ReviewEntrust'
 import SampleReceiveIndex from '../pages/soil-sample-manage/sample-receive/SampleReceiveIndex'
 import SamplePreparationIndex from '../pages/soil-sample-manage/sample-preparation/SamplePreparationIndex'
+import AddressManage from '../pages/soil-sample-manage/sample-address/AddressManage'
 import Blank from '~/pages/blank'
 export default [
   {
@@ -55,6 +56,11 @@ export default [
         path: 'backups',
         component: workbench,
         meta: { title: '备样管理' }
+      },
+      {
+        path: 'receive_location',
+        component: AddressManage,
+        meta: { title: '收样位置管理' }
       }
     ]
   },