修改备品备件库存预警，报工增加用人说明

Signed-off-by: Yangwl <1726150332@qq.com>

src/views/device/sparePartsLedger/index.vue

@@ -160,6 +160,7 @@
     <el-table
       v-loading="loading"
       :data="sparePartsLedgerList"
+      :cell-style="rowStyle"
       @selection-change="handleSelectionChange"
     >
       <!-- 序号 -->
@@ -910,6 +911,14 @@ export default {
     indexMethod(index) {
       return index + 1;
     },
+    rowStyle({ row }) {
+      if (row.amount < row.safeStock) {
+        return {
+          backgroundColor: 'rgba(255, 0, 0, 0.1)',
+          color: '#ff0000'
+        }
+      }
+    },
     /** 查询备品备件台账管理列表 */
     getList() {
       this.loading = true;

src/views/device/sparepartsInOutStorage/index.vue

@@ -49,6 +49,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="日期" prop="spareName">
+        <el-date-picker
+          v-model="queryParams.planDateArray"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -175,7 +186,7 @@
       <el-table-column
         label="出入库人员"
         align="center"
-        prop="createBy"
+        prop="nickName"
         width="180"
       />
       <el-table-column

src/views/mes/reportWork/index.vue

@@ -23,7 +23,7 @@
 					@keyup.enter.native="handleQuery" />
 			</el-form-item>
 			<el-form-item label="生产时间" prop="feedbackTimeArray">
-				<el-date-picker v-model="queryParams.feedbackTimeArray" format="yyyy-MM-dd" type="datetimerange"
+				<el-date-picker v-model="queryParams.feedbackTimeArray" format="yyyy-MM-dd" type="daterange"
         clearable
 					range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
 				</el-date-picker>
@@ -426,6 +426,14 @@
 							v-model="item.remark" placeholder="请输入内容(300个字内)" maxlength=300 >
 						</el-input>
 					</div>
+
+          <div class="demo-input-suffix">
+            <p>用人情况说明：</p>
+            <el-input type="textarea" @blur="addUseManRemarkblur(item.libList, item.useManRemark, index)"
+                      v-model="item.useManRemark" placeholder="请输入内容(300个字内)" maxlength=300 >
+            </el-input>
+          </div>
+
 				</el-tab-pane>
 			</el-tabs>
 			<div slot="footer" class="dialog-footer">
@@ -1055,6 +1063,7 @@ export default {
         recordUser: null,
         status: null,
         remark: null,
+        useManRemark: null,
         workTime: null,
         machineCode: null,
         machineName: null,
@@ -1211,6 +1220,7 @@ export default {
       let sr = this.selectRow[0];
       if (sr.uploadStatus == "1") {
         this.$modal.msgError(`上报sap已完成,不能重复报工`);
+        this.loading = false;
         return;
       }
 
@@ -1768,6 +1778,12 @@ export default {
         item.remark = remark;
       });
     },
+    //添加用人说明
+    addUseManRemarkblur(table, useManRemark, index) {
+      table.forEach((item) => {
+        item.useManRemark = useManRemark;
+      });
+    },
     getRKSummaries(param) {
       const { columns, data } = param;
       const sums = [];

src/views/wms/product/index.vue

@@ -1023,7 +1023,16 @@ export default {
     /**选择产品进行工艺同步**/
     handleSyncProductSAP() {
       const productCodes = this.productCodes;
-      return syncProductSAP(productCodes);
+      this.loading = true;
+      syncProductSAP(productCodes).then((response) => {
+        this.loading = false;
+        if(response.code == 200){
+          this.$modal.msgSuccess(response.msg);
+        }else {
+          this.$modal.msgError(response.msg)
+        }
+      });
+      // return syncProductSAP(productCodes);
     },
 
     handleBoxTypeChange(selectedBoxType) {