heyang

src/api/chemicalManage/index.js

@@ -48,6 +48,15 @@ export function chemicalIndexWarnCount(query) {
     params: query
   })
 }
+//首页-厂家模糊查询
+export function chemicalAioSearchProducer(query) {
+  return request({
+    url: '/chemical/aio/searchProducer',
+    method: 'get',
+    params: query
+  })
+}
+
 //首页-管控级别
 export function chemicalIndexManageLevel(query) {
   return request({

src/views/chemicalManage/inventoryManagement/inventoryStatistics/infoPage.vue

@@ -7,8 +7,8 @@
     <div class="content-box">
       <div class="content-box-left scrollbar-box">
         <li class="chemical-name">{{newData.stock.chemicalName}}<p class="chemical-state">{{newData.stock.status==1?'未出库':'出库'}}</p></li>
-        <li>{{newData.data3}}</li>
-        <li>类别：{{newData.stock.chemicalCategory}}<p class="control-state">{{newData.stock.chemicalLevel?'管控':'非管控'}}</p></li>
+        <li>{{newData.stock.chemicalShape==1?'固体':'液体'}}/{{newData.stock.chemicalPurity}}/{{newData.stock.casNum}}</li>
+        <li>类别：{{newData.stock.chemicalCategoryName}}<p class="control-state">{{newData.stock.chemicalLevel?'管控':'非管控'}}</p></li>
         <li>编码：{{newData.stock.tagCode}}</li>
         <li>RFID标签：{{newData.stock.rfidCode}}</li>
         <li>规格：{{newData.stock.specNum}}{{newData.stock.specUnit}}{{newData.stock.packUnit}}</li>

src/views/chemicalManage/inventoryManagement/savePending/addPage.vue

@@ -107,13 +107,23 @@
             <el-table-column label="纯度" prop="chemicalPurity" width="150" show-overflow-tooltip/>
             <el-table-column label="厂家" prop="factory" width="210" show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-input
+                <el-select
                   class="table-date"
+                  style="width:186px;"
                   v-model="scope.row.factory"
-                  placeholder="请输入厂家名称"
-                  maxLength="30"
-                  style="width:186px;">
-                </el-input>
+                  filterable
+                  remote
+                  reserve-keyword
+                  @change="factoryChange"
+                  placeholder="请搜索选择厂家"
+                  :remote-method="factorySelectList">
+                  <el-option
+                    v-for="item in factoryOptions"
+                    :key="item.id"
+                    :label="item.producerName"
+                    :value="item.producerName">
+                  </el-option>
+                </el-select>
               </template>
             </el-table-column>
             <el-table-column label="过期时间" prop="expireTime" width="170" show-overflow-tooltip>
@@ -241,6 +251,7 @@
   import addChemicals from "@/views/chemicalManage/components/addChemicals.vue";
   import { getDicts, systemSubjectGetList } from '@/api/commonality/noPermission'
   import {
+    chemicalAioSearchProducer,
     chemicalApplyAdd, chemicalApplyGetUserInfo,
     chemicalApplyUpdate, chemicalChemicalGetList, chemicalStockGetStockBysubId,
     chemicalStockWaitAdd, chemicalStockWaitUpdate,
@@ -268,6 +279,7 @@
             { required: true, message: "请搜索选择化学品", validator: this.spaceJudgment, trigger: "blur" }
           ],
         },
+        factoryOptions:[],
         // 化学品列表
         chemicalsOptions:[],
         // 化学品列表临时存储
@@ -578,6 +590,29 @@
           this.$set(this,'subOptions',[]);
         }
       },
+      //选中厂家
+      factoryChange(val){
+        let self = this;
+        // for(let i=0;i<self.subOptions.length;i++){
+        //   if(self.subOptions[i].subId == val){
+        //     this.$set(this.newData,'subId',self.subOptions[i].subId);
+        //     this.$set(this.newData,'subName',self.subOptions[i].subName);
+        //     this.$set(this.newData,'roomNum',self.subOptions[i].roomNum);
+        //   }
+        // }
+      },
+      //搜索厂家
+      factorySelectList(query){
+        if (query !== '' && query.length>1) {
+          chemicalAioSearchProducer({"name":query,}).then(response => {
+            this.$set(this,'factoryOptions',response.data);
+          });
+        } else {
+          this.$set(this,'factoryOptions',[]);
+        }
+      },
+
+
       //实验室-固体液体液体已存储量
       chemicalStockGetStockBysubId(subId){
         chemicalStockGetStockBysubId({"subId":subId}).then(response => {

src/views/chemicalManage/useLedger/infoPage.vue

@@ -7,7 +7,7 @@
     <div class="content-box">
         <div class="content-box-left scrollbar-box">
             <li class="chemical-name">{{newData.chemicalDetail.chemicalName}}<p class="chemical-state">{{newData.chemicalDetail.status==1?'未出库':'出库'}}</p></li>
-            <li>{{newData.data3}}</li>
+            <li>{{newData.chemicalDetail.chemicalShape==1?'固体':'液体'}}/{{newData.chemicalDetail.chemicalPurity}}/{{newData.chemicalDetail.casNum}}</li>
             <li>类别：{{newData.chemicalDetail.chemicalCategory}}<p class="control-state">{{newData.chemicalDetail.chemicalLevel?'管控':'非管控'}}</p></li>
             <li>编码：{{newData.chemicalDetail.tagCode}}</li>
             <li>RFID标签：{{newData.chemicalDetail.rfidCode}}</li>
@@ -44,9 +44,9 @@
                   <!-- tagCode 1领用，0是归还，3是空瓶出库-->
                   <div class="record-li-b">
                       <p>{{parseTime(item.collectTime,"{y}-{m}-{d} {h}:{i}")}}</p>
-                      <p v-if="item.tagCode==1 || item.tagCode==3">{{item.collectNowNum}}</p>
-                      <p v-if="item.tagCode==0 || item.tagCode==3">{{item.useAmount}}</p>
-                      <p v-if="item.tagCode==0">{{item.returnStockNum}}</p>
+                      <p v-if="item.tagCode==1 || item.tagCode==3">{{item.collectNowNum}}{{item.specUnit}}</p>
+                      <p v-if="item.tagCode==0 || item.tagCode==3">{{item.useAmount}}{{item.specUnit}}</p>
+                      <p v-if="item.tagCode==0">{{item.returnStockNum}}{{item.specUnit}}</p>
                       <p v-if="item.tagCode==1 || item.tagCode==3">{{item.isBottle?'是':'否'}}</p>
                       <p>{{item.outType}}</p>
                       <p>{{item.doubleAuthen}}</p>