Merge branch 'master' of http://192.168.1.43:3000/v3/v3-lab-web

src/api/chemicalManage/index.js

@@ -436,6 +436,14 @@ export function chemicalStockWaitUpdateByExpire(data) {
     data: data
   })
 }
+//待入库-同步
+export function chemicalStockWaitUpdateStockWait(data) {
+  return request({
+    url: '/chemical/stockWait/updateStockWait',
+    method: 'post',
+    data: data
+  })
+}
 //实验室-固体液体液体已存储量
 export function chemicalStockGetStockBysubId(query) {
   return request({

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

@@ -8,7 +8,7 @@
           <el-form-item label="" prop="deptId">
             <el-select v-model="queryParams.deptId"
                        placeholder="请选择学院"
-                       style="width: 140px">
+                       style="width: 120px">
               <el-option
                 v-for="item in deptOptions"
                 :key="item.deptId"
@@ -29,7 +29,7 @@
           <el-form-item label="" prop="chemicalLevel">
             <el-select v-model="queryParams.chemicalLevel"
                        placeholder="请选择级别"
-                       style="width: 120px">
+                       style="width: 110px">
               <el-option
                 v-for="dict in levelList"
                 :key="dict.value"
@@ -39,7 +39,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="" prop="chemicalCategory">
-            <el-select v-model="queryParams.chemicalCategory" clearable placeholder="请选择类别" style="width: 120px">
+            <el-select v-model="queryParams.chemicalCategory" clearable placeholder="请选择类别" style="width: 110px">
               <el-option
                 v-for="dict in optionListA"
                 :key="dict.value"
@@ -65,17 +65,22 @@
             <el-input
               maxLength="30"
               v-model="queryParams.searchValue"
-              placeholder="化学品名/CAS/编码/实验室/房间号..."
-              style="width: 260px"
+              placeholder="化学品名/CAS/编码/实验室/订单号..."
+              style="width: 240px"
             />
           </el-form-item>
           <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
           <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
           <p class="page-submit-common-style-button"
-             style="float: right;"
+             style="float: right;width: 60px"
              v-hasPermiRouter="['stock:wait:add']"
              @click="tableButton(1)"
           >添加</p>
+          <p class="page-submit-common-style-button"
+             style="float: right;width: 60px;margin-right: 10px"
+             v-hasPermiRouter="['stock:wait:add']"
+             @click="tableButton(5)"
+          >同步</p>
           <el-form-item style="float: right;">
             <export-component :exportConfig="exportConfig" v-hasPermiRouter="['stock:wait:export']"></export-component>
           </el-form-item>
@@ -150,7 +155,7 @@
                    @click="tableButton(2,scope.row)"
                 >详情</p>
                 <p class="table-button-p"
-                   v-if="scope.row.source==2 || scope.row.source==3"
+                   v-if="scope.row.source==2 || scope.row.source==3 || scope.row.source==4"
                    v-hasPermiRouter="['stock:wait:edit']"
                    @click="tableButton(3,scope.row)"
                 >编辑</p>
@@ -193,7 +198,7 @@
     chemicalApplyDetail,
     chemicalStockWaitDelete, chemicalStockWaitDetail,
     chemicalStockWaitList,
-    chemicalStockWaitUpdateByExpire
+    chemicalStockWaitUpdateByExpire, chemicalStockWaitUpdateStockWait
   } from '@/api/chemicalManage'
   export default {
     name: 'index',
@@ -352,6 +357,11 @@
               self.getList();
             });
           }).catch(() => {});
+        }else if(type == 5){
+          //同步
+          chemicalStockWaitUpdateStockWait().then(response => {
+            self.msgSuccess(response.message)
+          });
         }else if(type == 'out'){
           //返回并刷新
           this.$set(this,'pageType',1);