修改了收样室收样

pages/soil-sample-manage/sample-receive/ReceiveByEntrust.vue

@@ -63,7 +63,7 @@
     <!--选择领样人-->
     <keep-alive>
       <!-- eslint-disable-next-line vue/require-component-is -->
-      <component ref="refModal" :is="currentComponent"></component>
+      <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
     </keep-alive>
   </div>
 </template>

pages/soil-sample-manage/sample-receive/ReceiveBySample.vue

@@ -6,23 +6,23 @@
         <Row>
           <!--查询-->
           <Col span="24">
-            <Form v-show="searchOpen" id="search-form" :label-width="70" inline onsubmit="return false">
+            <Form id="search-form" v-show="searchOpen" :label-width="70" inline onsubmit="return false">
               <label class="label-sign"></label>
               <Form-item class="search-item" label="委托商:">
-                <Input v-model="formObj.client" placeholder="请输入委托编号" clearable @on-enter="_formSearch"></Input>
+                <Input v-model="formObj.client" @on-enter="_formSearch" placeholder="请输入委托编号" clearable></Input>
               </Form-item>
               <Form-item class="search-item" label="委托编号:">
-                <Input v-model="formObj.entrustCode" placeholder="请输入委托单位" clearable @on-enter="_formSearch"></Input>
+                <Input v-model="formObj.entrustCode" @on-enter="_formSearch" placeholder="请输入委托单位" clearable></Input>
               </Form-item>
               <Form-item class="search-btn">
-                <Button type="primary" @click="_formSearch">搜索</Button>
+                <Button @click="_formSearch" type="primary">搜索</Button>
               </Form-item>
             </Form>
           </Col>
           <!--操作-->
           <Col span="24">
-            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
-                      @on-result-change="_btnClick">
+            <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
+                      class="contHide">
             </btn-list>
           </Col>
           <!-- 表格 -->
@@ -61,26 +61,22 @@
     </div>
     <!--组件加载-->
     <!--选择领样人-->
-    <UserInfo ref="userModal" @on-result-change="_userResult"></UserInfo>
-    <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>
-    <ItemManage ref="itemManageModal" @on-result-change="_page"></ItemManage>
-    <Operation ref="operation"></Operation>
-    <FileManage ref="FileManage"></FileManage>
+    <keep-alive>
+      <!-- eslint-disable-next-line vue/require-component-is -->
+      <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
+    </keep-alive>
+<!--    <SampleManage ref="sampleManageModal" @on-result-change="_page"></SampleManage>-->
+<!--    <Operation ref="operation"></Operation>-->
+<!--    <FileManage ref="FileManage"></FileManage>-->
   </div>
 </template>
 <script>
-import UserInfo from '../../../components/user-info-single/AssignPerson'
 import { soilEntrust } from '../../../api'
 import Operation from '../../../components/operation/Operation'
 import SampleManage from './entrust-sample-manage/SampleManageHis'
-import ItemManage from './ItemManage'
 export default {
-  components: {
-    UserInfo,
-    SampleManage,
-    ItemManage,
-    Operation
-  },
+  // eslint-disable-next-line vue/no-unused-components
+  components: { SampleManage, Operation },
   data() {
     return {
       formObj: {
@@ -145,39 +141,6 @@ export default {
     // this.acceptSelectUserValue = localStorage.getItem('acceptSelectUserValue')
   },
   methods: {
-    _userResult(data, msg) {
-      const sendData = {
-        ids: this.selectIds.join(',')
-      }
-      if (data) {
-        sendData.person = data.realname
-        sendData.personId = data.userId
-      }
-      switch (msg) {
-        case 'contractSendMan':
-          // 一键发放
-          this.$store.dispatch('FoodContract/oneKeySend', sendData).then(() => {
-            this._resultChange('发放成功')
-          })
-          break
-        case 'contractReceiveSendMan':
-          // 一键接收并发放
-          this.$store
-            .dispatch('FoodContract/oneKeyReceiveSend', sendData)
-            .then(() => {
-              this._resultChange('一键接收并发放成功')
-            })
-          break
-        case 'sampleSendScanMan':
-          // 扫码发放
-          this.$refs.refModal._open('扫码发放', data)
-          break
-        case 'sampleReceiveSendScanMan':
-          // 扫码接收并发放
-          this.$refs.refModal._open('扫码接收发放', data)
-          break
-      }
-    },
     // 一键接收并发放
 
     // 组件返回值
@@ -194,154 +157,14 @@ export default {
           case 'search':
             this.searchOpen = !this.searchOpen
             break
-          default:
-            this._btnOption(msg)
         }
       })
     },
-    // btn操作
-    _btnOption(msg) {
-      console.log(msg)
-      switch (msg) {
-        case '一键接收':
-          this._oneKeyReceive()
-          break
-        case '一键发放':
-          this._oneKeySend()
-          break
-        case '一键接收并发放':
-          this._oneKeyReceiveSend()
-          break
-        case '扫码接收':
-          this.currentComponent = 'ReceiveScan'
-          this.$nextTick(function() {
-            this.$refs.refModal._open()
-          })
-          break
-        case '扫码发放':
-          this._scanSend('sampleSendScanMan')
-          break
-        case '扫码接收并发放':
-          this._scanSend('sampleReceiveSendScanMan')
-          break
-        case '信息维护':
-          this._maintainInfo()
-          break
-        case '登记协议':
-          this._editModals(msg)
-          break
-      }
-    },
     // 扫码接收并发放
-    _scanSend(msg) {
-      if (msg === 'sampleReceiveSendScanMan' || msg === 'sampleSendScanMan') {
-        // 扫码接收并发放判断是够选人
-        if (this.acceptSelectUserValue === '是') {
-          this.$refs.userModal._open(msg, '请选择领样人')
-        } else {
-          this.$refs.refModal._open('扫码发放')
-        }
-      } else {
-        // 其他
-        this.$refs.userModal._open(msg, '请选择领样人')
-      }
-    },
     // 一键接收并发放
-    _oneKeyReceiveSend() {
-      if (this.selectIds.length === 0) {
-        this.$msgTip('warning', '请至少选择一条数据！')
-      } else {
-        // 根据字典是否选择人员
-        // eslint-disable-next-line no-lonely-if
-        if (this.acceptSelectUserValue === '是') {
-          // 选择人员接收并发放
-          this.$store
-            .dispatch('FoodContract/oneKeyReceiveSendCheck', {
-              ids: this.selectIds.join(',')
-            })
-            .then(() => {
-              const result = this.$store.state.FoodContract.success
-              if (result) {
-                // 验证成功
-                this.$refs.userModal._open(
-                  'contractReceiveSendMan',
-                  '请选择领样人'
-                )
-              }
-            })
-        } else {
-          // 不选择人员
-          this.$store
-            .dispatch('FoodContract/oneKeyReceiveSend', {
-              ids: this.selectIds.join(',')
-            })
-            .then(() => {
-              this._resultChange('一键接收并发放成功')
-            })
-        }
-      }
-    },
     // 一键发放
-    _oneKeySend() {
-      if (this.selectIds.length === 0) {
-        this.$msgTip('warning', '请至少选择一条数据！')
-      } else {
-        // 一键发放判断是否选人
-        // eslint-disable-next-line no-lonely-if
-        if (this.acceptSelectUserValue === '是') {
-          this.$store
-            .dispatch('FoodContract/oneKeySendCheck', {
-              ids: this.selectIds.join(',')
-            })
-            .then(() => {
-              if (this.$store.state.FoodContract.success) {
-                this.$refs.userModal._open('contractSendMan', '请选择领样人')
-              }
-            })
-        } else {
-          // 一键发放
-          this.$store
-            .dispatch('FoodContract/oneKeySend', {
-              ids: this.selectIds.join(',')
-            })
-            .then(() => {
-              this._resultChange('发放成功')
-            })
-        }
-      }
-    },
     // 一键接收
-    _oneKeyReceive() {
-      if (this.selectIds.length === 0) {
-        this.$msgTip('warning', '请至少选择一条数据！')
-      } else {
-        this.$Modal.confirm({
-          title: '提示',
-          content:
-            '确定要一键接收这 ' + this.selectIds.length + ' 条委托下的样品？',
-          onOk: () => {
-            this.$store
-              .dispatch('FoodContract/oneKeyReceive', {
-                ids: this.selectIds.join(',')
-              })
-              .then(() => {
-                this._resultChange('接收成功')
-              })
-          }
-        })
-      }
-    },
     // 信息维护
-    _maintainInfo() {
-      if (this.selectIds.length === 0) {
-        this.$Message.warning('请至少选择一条数据！')
-      } else {
-        this.currentComponent = 'MaintainInfoModal'
-        this.$nextTick(() => {
-          this.$refs.refModal._open(this.selectIds, 1)
-        })
-      }
-    },
     _iconClick(res, data, currentComponent) {
       this.currentComponent = currentComponent
       console.log(res)
@@ -350,12 +173,6 @@ export default {
           case '管理样品':
             this._editModal(data.id, data.type, data.entrustCode)
             break
-          case '项目管理':
-            this.$refs.itemManageModal._open(data.id)
-            break
-          case '编辑协议':
-            this._editModals(res, data)
-            break
           case '附件':
             this._upload(data.id)
             break
@@ -366,20 +183,11 @@ export default {
       })
     },
     _editModal(id, type, name) {
-      this.$refs.sampleManageModal._open(id, type, name)
-    },
-    _editModals(res, data) {
-      if (res === '登记协议') {
-        this.$refs.editModal._open(res, data)
-      } else if (res === '编辑协议') {
-        this.$store
-          .dispatch('FoodContract/verificationEdit', { id: data.id })
-          .then(() => {
-            if (this.$store.state.FoodContract.model === true) {
-              this.$refs.editModal._open(res, data)
-            }
-          })
-      }
+      this.currentComponent = 'SampleManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id, type, name)
+      })
+      // this.$refs.sampleManageModal._open(id, type, name)
     },
     _tableResultChange(msg, data) {
       switch (msg) {
@@ -411,27 +219,16 @@ export default {
         this.getPage = result
       }
     },
-    _detailModal(id, type) {
-      // 查看
-      this.$store.dispatch('FoodContract/getById', id).then(() => {
-        if (type === 0) {
-          // 企业委托 ’0‘
-          this.currentComponent = 'FoodContractCompanyDetail'
-        } else {
-          // 政府委托 ’1‘
-          this.currentComponent = 'FoodContractGovernDetail'
-        }
-        this.$nextTick(() => {
-          this.$refs.refModal._open(this.$store.state.FoodContract.model)
-        })
-      })
-    },
     _search() {
       this._page()
     },
     _operationRecord(id) {
       // 操作日志
-      this.$refs.operation._open(id)
+      this.currentComponent = 'Operation'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id)
+      })
+      // this.$refs.operation._open(id)
     },
     _resultChange(msg) {
       if (this.$store.state.FoodContract.success) {
@@ -442,7 +239,11 @@ export default {
     },
     _upload(id) {
       // 上传文件
-      this.$refs.FileManage._open(id, 'entrustId')
+      this.currentComponent = 'FileManage'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id, 'entrustId')
+      })
+      // this.$refs.FileManage._open(id, 'entrustId')
     }
   }
 }