Merge branch 'master' into 'master'

临购药品申请优化

See merge request lighter/vue-intergration-platform!96

src/views/yp-dict/YpDictInfo.vue

@@ -25,6 +25,7 @@
           <el-table-column prop="name" label="药品名称" width="300" show-overflow-tooltip />
           <el-table-column prop="specification" label="药品规格" width="180" show-overflow-tooltip />
           <el-table-column prop="packRetprice" label="药品零售价" width="100" />
+          <el-table-column prop="manuFactory" label="生产厂家" width="180" show-overflow-tooltip />
           <el-table-column prop="delFlag" label="状态" width="70">
             <template #default="scope">
               <span v-if="scope.row.delFlag === '1'" style="color:#d12020;">停用</span>

src/views/yp-inventory/YpTempPurchase.vue

@@ -4,7 +4,7 @@
       <el-input v-model="inpatientNo" class="w-50 m-2" style="width: 220px" placeholder="请输入姓名/住院号" clearable>
       </el-input>
       <el-select v-model="chargeCode" placeholder="请选择临购药品" filterable clearable
-                 style="width: 320px;margin-left: 3px">
+                 remote style="width: 320px;margin-left: 3px" :remote-method="queryTempPurchaseYp">
         <el-option v-for="item in tempPurchaseData" :key="item.chargeCode" :label="item.chargeName"
                    :value="item.chargeCode">
           <span style="float: left">{{ item.chargeName }}</span>
@@ -32,19 +32,20 @@
             <div class="layout_main layout_el-table">
               <el-table :data="ypPurchaseData.slice(pageSize * (currentPage - 1), pageSize * currentPage)" border
                          stripe highlight-current-row>
-                <el-table-column type="index" label="序号" width="60"/>
-                <el-table-column prop="chargeCode" label="药品编码" width="90"/>
-                <el-table-column prop="serial" label="药品包装" width="70">
+                <el-table-column type="index" label="序号" width="60" fixed/>
+                <el-table-column prop="chargeCode" label="药品编码" width="90" fixed/>
+                <el-table-column prop="serial" label="药品包装" width="70" fixed>
                   <template #default="scope">
                     <span v-if="scope.row.serial === '99'">大包装</span>
                     <span v-else>小包装</span>
                   </template>
                 </el-table-column>
-                <el-table-column prop="chargeName" label="药品名称" width="220" show-overflow-tooltip/>
+                <el-table-column prop="chargeName" label="药品名称" width="220" show-overflow-tooltip fixed/>
                 <el-table-column prop="specification" label="药品规格" width="140" show-overflow-tooltip/>
                 <el-table-column prop="name" label="患者姓名" width="100"/>
                 <el-table-column prop="inpatientNo" label="住院号" width="100"/>
                 <el-table-column prop="amount" label="数量" width="70"/>
+                <el-table-column prop="manuFactory" label="厂家" width="140" show-overflow-tooltip/>
                 <el-table-column prop="useResult" label="使用理由" width="200" show-overflow-tooltip/>
                 <el-table-column prop="op" label="申请人" width="100"/>
                 <el-table-column prop="applyDate" label="申请时间" width="140"/>
@@ -109,7 +110,7 @@
               <el-col :span="6">
                 <el-form-item label="药品" prop="chargeCode">
                   <el-select v-model="ruleForm.chargeCode" placeholder="请选择药品" filterable clearable
-                             style="width: 100%" @change="ypChange">
+                             remote style="width: 100%" @change="ypChange" :remote-method="queryTempPurchaseYp">
                     <el-option v-for="item in tempPurchaseData" :key="item.chargeCode"
                                :label="item.chargeName" :value="item.chargeCode">
                       <span style="float: left">{{ item.chargeName }}</span>
@@ -134,17 +135,17 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="数量" prop="amount">
-                  <el-input v-model="ruleForm.amount" maxlength="10" show-word-limit
-                            placeholder="请填写数量" autocomplete="off"/>
+                <el-form-item label="厂家" prop="manuFactory">
+                  <el-input v-model="ruleForm.manuFactory" maxlength="32" show-word-limit
+                            placeholder="厂家" disabled/>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="6">
-                <el-form-item label="申请人" prop="op">
-                  <el-input v-model="ruleForm.op" maxlength="40" show-word-limit
-                            placeholder="请填写申请人" disabled/>
+                <el-form-item label="数量" prop="amount">
+                  <el-input v-model="ruleForm.amount" maxlength="10" show-word-limit
+                            placeholder="请填写数量" autocomplete="off"/>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -160,18 +161,24 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="申请日期" prop="applyDate">
-                  <el-input v-model="ruleForm.applyDate" show-word-limit placeholder="请填写申请日期"
-                            disabled/>
+                <el-form-item label="申请人" prop="op">
+                  <el-input v-model="ruleForm.op" maxlength="40" show-word-limit
+                            placeholder="申请人" disabled/>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="24">
+              <el-col :span="18">
                 <el-form-item label="使用理由" prop="useResult">
                   <el-input v-model="ruleForm.useResult" show-word-limit placeholder="请填写使用理由"/>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item label="申请日期" prop="applyDate">
+                  <el-input v-model="ruleForm.applyDate" show-word-limit placeholder="请填写申请日期"
+                            disabled/>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
@@ -300,6 +307,7 @@ const ypChange = async () => {
     ruleForm.value.chargeName = dataF[0].chargeName
     ruleForm.value.serial = dataF[0].serial
     ruleForm.value.specification = dataF[0].specification
+    ruleForm.value.manuFactory = dataF[0].manuFactory
   }
 }
 
@@ -323,6 +331,7 @@ const ruleForm = ref({
   applyDate: now, // 申请日期
   auditDate: '', // 审核日期
   result: '', // 未采购原因
+  manuFactory: '' // 厂家
 })
 const rules = ref({
   chargeCode: [
@@ -437,6 +446,7 @@ const exportData = () => {
       name: "患者姓名",
       inpatientNo: "住院号",
       amount: "数量",
+      manuFactory: '厂家',
       useResult: "使用理由",
       op: "申请人",
       receptFlag: "是否接收",