修改了入库管理

api/soil/soil-entrust.js

@@ -148,5 +148,9 @@ export default {
   aloneSampleDelete: data =>
     http.delete('soil/v1/alone_sample/?ids=' + data).then(res => res),
   getUserByGroupId: data =>
-    http.post('base/v1/user/page', data).then(res => res)
+    http.post('base/v1/user/page', data).then(res => res),
+  submitToInstock: data =>
+    http
+      .post('soil/v1/alone_sample/submit_to_out_storage', data)
+      .then(res => res)
 }

api/soil/soil-sample.js

@@ -246,5 +246,9 @@ export default {
   aloneWarehouseLocationDelete: data =>
     http
       .delete('soil/v1/alone_warehouse_location/?ids=' + data)
-      .then(res => res)
+      .then(res => res),
+  pageWaitStorage: data =>
+    http.post('soil/v1/alone_sample/page_wait_storage', data).then(res => res),
+  inStorageSubmit: data =>
+    http.post('soil/v1/alone_sample/in_storage_submit', data).then(res => res)
 }

pages/soil-alone-sample-instock/EntrustRegister.vue

@@ -63,6 +63,7 @@ import importModal from '../../components/import/DownloadTemplateImport'
 import EntrustRegisterEdit from './EntrustRegisterEdit'
 import RegisterDetail from './RegisterDetail'
 import ViewDetail from './ViewDetail'
+import Instock from './Instock'
 export default {
   components: {
     // eslint-disable-next-line vue/no-unused-components
@@ -74,7 +75,9 @@ export default {
     // eslint-disable-next-line vue/no-unused-components
     RegisterDetail,
     // eslint-disable-next-line vue/no-unused-components
-    ViewDetail
+    ViewDetail,
+    // eslint-disable-next-line vue/no-unused-components
+    Instock
   },
   data() {
     return {
@@ -85,12 +88,7 @@ export default {
         {
           type: 'success',
           id: '',
-          name: '登记'
-        },
-        {
-          type: 'success',
-          id: '',
-          name: '提交'
+          name: '入库'
         }
       ],
       iconMsg: [
@@ -147,6 +145,9 @@ export default {
       this.currentComponent = componentName
       this.$nextTick(function() {
         switch (msg) {
+          case '入库':
+            this._instock()
+            break
           case '试验委托单导入':
             this._import()
             break
@@ -165,6 +166,16 @@ export default {
         }
       })
     },
+    _instock() {
+      if (this.selectIds.length === 0) {
+        this.$Message.warning('请至少选择一条数据')
+      } else {
+        this.currentComponent = 'Instock'
+        this.$nextTick(() => {
+          this.$refs.refModal._open(this.selectIds)
+        })
+      }
+    },
     _detailModal(data) {
       console.log(data)
       this._getUserInfo(data)
@@ -322,7 +333,7 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      const result = await soilSample.aloneSamplePage(
+      const result = await soilSample.pageWaitStorage(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-alone-sample-instock/Instock.vue

+<template>
+  <div>
+    <Modal v-model="showEditModal" v-drag :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="storehouse" style="width: 100%">
+            <Input v-model="formObj.storehouse" name="storehouse" placeholder="请输入库房号"/>
+          </Form-item>
+          <Form-item label="架位号" prop="shelfCode" style="width: 100%">
+            <Input v-model="formObj.shelfCode" name="shelfCode" placeholder="请输入架位号"/>
+          </Form-item>
+          <Form-item label="入库人" prop="inStocker" style="width: 100%">
+            <Input v-model="formObj.inStocker" @click.native="_selectStaff" name="inStocker" readonly/>
+          </Form-item>
+          <Form-item prop="inStockerId" style="width: 100%;display: none">
+            <Input v-model="formObj.inStockerId" @click.native="_selectStaff" name="inStockerId" readonly/>
+          </Form-item>
+          <Form-item label="入库时间：" prop="instockTime">
+            <Date-picker v-model="formObj.instockTime" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
+                         placeholder="请选择入库时间" name="instockTime"></Date-picker>
+          </Form-item>
+          <Form-item label="留存有效期：" prop="keepLimitTime">
+            <Date-picker v-model="formObj.keepLimitTime" @on-change="_keepLimitTimeChange" type="date" split-panels style="width:100%;"
+                         placeholder="请选择入库时间" name="keepLimitTime"></Date-picker>
+          </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: '',
+      id: '',
+      lengthLimitList: [
+        { key: 'stdNum', title: '标准号' },
+        { key: 'enName', title: '英文名称' },
+        { key: 'belongUnit', title: '归口单位' },
+        { key: 'publishUnit', title: '发布单位' }
+      ],
+      modalTitle: '入库',
+      formObj: {
+        name: '',
+        warehouse: '',
+        type: '',
+        remark: '',
+        inStocker: '',
+        inStockerId: ''
+      },
+      options: [
+        {
+          name: '国家标准'
+        },
+        {
+          name: '地方标准'
+        },
+        {
+          name: '行业标准'
+        },
+        {
+          name: '企业标准'
+        }
+      ],
+      typeData: [
+        {
+          name: '待检',
+          value: 0
+        },
+        {
+          name: '备样',
+          value: 1
+        },
+        {
+          name: '备用',
+          value: 2
+        }
+      ],
+      ruleValidate: {
+        warehouse: [
+          { 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.inStocker = user.realname
+      this.formObj.inStockerId = user.id
+      console.log(user)
+    },
+    _selectStaff() {
+      this.$refs.userModal._open()
+    },
+    _userData(data, msg, contractTempData) {
+      this.formObj.inStocker = data.realname
+      this.formObj.inStockerId = data.id
+      console.log(data, msg)
+    },
+    _ctimeChange(data) {
+      this.formObj.instockTime = data
+    },
+    _keepLimitTimeChange(data) {
+      this.formObj.keepLimitTime = data
+    },
+    /** *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) {
+          const data = this.$serialize('edit-form')
+          console.log(data)
+          data.ids = this.id
+          this._instockSubmit(data)
+        } else {
+          this.$Message.error('表单验证失败!')
+          this._hideLoading()
+        }
+      })
+    },
+    _instockSubmit: async function(data) {
+      const result = await soilSample.inStorageSubmit(data)
+      if (result) {
+        this._resultChange('成功入库')
+      }
+    },
+    _save: async function(data) {
+      const result = await soilSample.aloneWarehouseLocationAdd(data)
+      if (result) {
+        this._resultChange('添加成功!')
+      }
+    },
+    _edit: async function(data) {
+      const result = await soilSample.aloneWarehouseLocationEdit(data)
+      if (result) {
+        this._resultChange('编辑成功!')
+      }
+    },
+    _cancel() {
+      this._hideLoading()
+      this.showEditModal = false
+    },
+    _open(ids) {
+      this.formId = this.$randomCode()
+      this._hideLoading()
+      this.$refs.formObj.resetFields()
+      this.id = ids.join(',')
+      this._getUser()
+      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-alone-sample-manage/storehouse-place-manage/AddressManageEdit.vue

@@ -134,6 +134,8 @@ export default {
       this.$refs.userModal._open()
     },
     _userData(data, msg, contractTempData) {
+      this.formObj.manager = data.realname
+      this.formObj.managerId = data.id
       console.log(data, msg)
     },
     /** *modal-footer */

pages/soil-alone-sample/EntrustRegister.vue

@@ -152,11 +152,8 @@ export default {
           case '登记':
             this._editModal(false)
             break
-          case '提交至评审':
-            this._submitToReview()
-            break
           case '提交':
-            this._submitToSkipReview()
+            this._submitToInstock()
             break
           case 'search':
             this.searchOpen = !this.searchOpen
@@ -247,8 +244,8 @@ export default {
         this.$refs.refModal._openByEntrustId(data)
       })
     },
-    _submitToReview() {
-      this._submitByContractIds('委托评审')
+    _submitToInstock() {
+      this._submitByContractIds('出库')
     },
     _submitToSkipReview() {
       const ids = this.selectIds
@@ -281,7 +278,7 @@ export default {
       }
     },
     _subToRe: async function(ids) {
-      const result = await soilEntrust.submit(ids)
+      const result = await soilEntrust.submitToInstock({ ids: ids.join(',') })
       if (result) {
         this._resultChange('提交成功')
       }

pages/soil-sample-manage/sample-address/AddressManageEdit.vue

@@ -117,6 +117,8 @@ export default {
       this.$refs.userModal._open()
     },
     _userData(data, msg, contractTempData) {
+      this.formObj.manager = data.realname
+      this.formObj.managerId = data.id
       console.log(data, msg)
     },
     /** *modal-footer */