From f426ef8a073101fb2c753dc3365d51ff10fcae7b Mon Sep 17 00:00:00 2001
From: cxw <1056036578@qq.com>
Date: Tue, 3 Jan 2023 14:03:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ReagentForm/index.vue          |  4 +--
 src/views/reagent/applymanagement/index.vue   | 30 ++++++++++++++-----
 src/views/reagent/createapply/index.vue       |  6 +++-
 .../reagent/receivingandreturn/index.vue      |  8 +++--
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/components/ReagentForm/index.vue b/src/components/ReagentForm/index.vue
index a2dbd61..a4096f7 100644
--- a/src/components/ReagentForm/index.vue
+++ b/src/components/ReagentForm/index.vue
@@ -6,7 +6,7 @@
           <el-form-item label="试剂名称" prop="name">
             <!-- <el-input v-model="formData.name" placeholder="请输入试剂名称" clearable :style="{width: '100%'}" /> -->
             <el-autocomplete
-              v-model="formData.value"
+              v-model="formData.name"
               class="inline-input"
               :style="{width: '100%'}"
               :fetch-suggestions="querySearchAsync"
@@ -286,7 +286,7 @@ export default {
 
           // this.formData['name'] = this.formData.value
           //
-          this.$set(this.formData, 'name', this.formData.value)
+          this.$set(this.formData, 'name', this.formData.name)
           // delete this.formData['value']
           console.log(this.formData, '-----------------------')
           this.$emit('handlefunc', this.formData)
diff --git a/src/views/reagent/applymanagement/index.vue b/src/views/reagent/applymanagement/index.vue
index ffc4156..338c774 100644
--- a/src/views/reagent/applymanagement/index.vue
+++ b/src/views/reagent/applymanagement/index.vue
@@ -69,12 +69,24 @@
       title="选择审批生效时间"
     >
       <div class="box">
-        <div>
-          <el-radio v-model="radio1" label="2" border>2小时</el-radio>
-          <el-radio v-model="radio1" label="4" border>4小时</el-radio>
-          <el-radio v-model="radio1" label="6" border>6小时</el-radio>
-          <el-radio v-model="radio1" label="8" border>8小时</el-radio>
-        </div>
+        <el-form ref="form" :model="form" label-width="80px">
+          <el-form-item label="生效时间">
+            <el-radio-group v-model="radio1">
+              <el-radio  label="2" border>2小时</el-radio>
+              <el-radio  label="4" border>4小时</el-radio>
+              <el-radio  label="6" border>6小时</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="审批意见">
+            <el-radio-group v-model="radio2">
+              <el-radio  label="1" border>同意</el-radio>
+              <el-radio  label="0" border>驳回</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="备注">
+            <el-input type="textarea" v-model="information"></el-input>
+          </el-form-item>
+        </el-form>
       </div>
       <div slot="footer" style="text-align: center">
         <el-button @click="dialogVisible=false">取消</el-button>
@@ -125,6 +137,8 @@ export default {
     return {
       // drugStockForm:[],
       radio1:'2',
+      radio2:'1',
+      information:'',
       page: 1,
       page_size: 10,
       total: 0,
@@ -175,7 +189,9 @@ export default {
       var that=this
       const data={
         id:that.row.id,
-        t:that.radio1
+        t:that.radio1,
+        result:that.radio2,
+        information:that.information
       }
       update_solve(stringify(data)).then(rsp => {
           console.log(rsp)
diff --git a/src/views/reagent/createapply/index.vue b/src/views/reagent/createapply/index.vue
index 4bced46..c64812a 100644
--- a/src/views/reagent/createapply/index.vue
+++ b/src/views/reagent/createapply/index.vue
@@ -298,7 +298,10 @@ export default {
         return Object.assign({}, { name: item.name, num: item.num,client_id: item.client_id, purity: item.purity, speci: item.speci})
       })
       if (pt_from.user_id_pt === '') {
-        alert("请选择陪同人");
+        that.$message({
+          type: 'info',
+          message: '请选择陪同人'
+        }); 
       }else{
         const data = {
           user_id: this.$store.state.user.id,
@@ -312,6 +315,7 @@ export default {
             //清空表格多选框
             this.$refs.multipleTable.clearSelection();
             that.checkList=[]
+            this.get_apply()
           }
         }) 
       }
diff --git a/src/views/reagent/receivingandreturn/index.vue b/src/views/reagent/receivingandreturn/index.vue
index f6c4699..bb25d33 100644
--- a/src/views/reagent/receivingandreturn/index.vue
+++ b/src/views/reagent/receivingandreturn/index.vue
@@ -197,14 +197,15 @@ export default {
       this.getDrugInfo(this.barCode)
       if (this.$route.name.indexOf('Receiving') !== -1) {
         use(stringify({ 'bar_code': this.barCode })).then(res => {
-          this.tableData.push(res.data)
+          // this.tableData.push(res.data)
+          this.getList()
           this.$message.success(res.data.name + '  试剂领用成功！')
         })
       }
     },
     getList() {
       const data = {
-        status: this.$route.name === 'Receiving' ? 4 : 2,
+        status: this.$route.name === 'Receiving' ? 1 : 2,
         page: this.page,
         page_size: this.page_size
       }
@@ -284,7 +285,8 @@ export default {
           'remain': w ? parseFloat(this.inputWeigh).toFixed(2) : this.surplusWeigh
         }
         drug_return(stringify(data)).then(res => {
-          this.tableData.push(res.data)
+          // this.tableData.push(res.data)
+          this.getList()
           this.dialogVisible = false
           this.$message.success('归还成功！')
         })