Merge remote-tracking branch 'origin/master' into master

src/views/device/sparePartsLedger/index.vue

@@ -44,6 +44,27 @@
           style="width: 150px"
         />
       </el-form-item>
+      <el-form-item label="出入库日期">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="低于安全库存" prop="isLow">
+        <el-select v-model="queryParams.isLow" placeholder="数据状态" clearable>
+          <el-option
+            v-for="dict in dict.type.safety_stock"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <!-- <el-form-item label="备件类型" prop="spareType">
         <el-select
           v-model="queryParams.spareType"
@@ -160,6 +181,7 @@
     <el-table
       v-loading="loading"
       :data="sparePartsLedgerList"
+      :cell-style="rowStyle"
       @selection-change="handleSelectionChange"
     >
       <!-- 序号 -->
@@ -763,6 +785,7 @@ import QRCode from 'qrcode';
 
 export default {
   name: "SparePartsLedger",
+  dicts: ['safety_stock'],
   data() {
     return {
       // 导入数据
@@ -871,7 +894,10 @@ export default {
         ownEquipmentCode: null,
         unitPrice: null,
         procurementMethod: null,
+        isLow: null,
       },
+      // 日期范围
+      dateRange: [],
       options: [
         {
           spareType: "专用",
@@ -910,10 +936,18 @@ 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;
-      listSparePartsLedger(this.queryParams).then((response) => {
+      listSparePartsLedger(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
         this.sparePartsLedgerList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/device/sparepartsInOutStorage/index.vue

@@ -49,6 +49,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="日期">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          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"
@@ -120,6 +131,8 @@
       v-loading="loading"
       :data="sparepartsInOutStorageList"
       @selection-change="handleSelectionChange"
+      :summary-method="getSummaries"
+      show-summary
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- 序号 -->
@@ -175,7 +188,7 @@
       <el-table-column
         label="出入库人员"
         align="center"
-        prop="createBy"
+        prop="nickName"
         width="180"
       />
       <el-table-column
@@ -221,10 +234,11 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      :pageSizes="[50,100,200,500]"
       @pagination="getList"
     />
 
@@ -363,6 +377,8 @@ export default {
         delFlag: null,
         factoryCode: null,
       },
+      // 日期范围
+      dateRange: [],
       // 表单参数
       form: {},
       // 表单校验
@@ -401,12 +417,32 @@ export default {
     /** 查询备品备件出入库列表 */
     getList() {
       this.loading = true;
-      listSparepartsInOutStorage(this.queryParams).then((response) => {
+      listSparepartsInOutStorage(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
         this.sparepartsInOutStorageList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+
+      // 初始化所有列
+      columns.forEach((column, index) => {
+        if (index === 1) {
+          sums[index] = '总数'; // 第一列显示固定文本
+        } else if (column.property === 'amount') {
+          // 计算amount列合计
+          const total = data.reduce((sum, item) => {
+            const val = Number(item.amount);
+            return sum + (isNaN(val) ? 0 : val);
+          }, 0);
+          sums[index] = total + ' 个';
+        }
+      });
+
+      return sums;
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -441,6 +477,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

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/equipment/index.vue

@@ -689,6 +689,14 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="产线代号" prop="dh">
+                <el-input
+                  v-model="form.dh"
+                  placeholder="请输入产线代号"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="10" class="mb8">
             <el-col :span="24">
@@ -1383,6 +1391,7 @@ export default {
         equipmentCategory: null,
         factoryWorkshop: null,
         sapAsset: null,
+        dh: null
       },
       queryEquipmentHeadParams: {
         pageNum: 1,
@@ -1609,6 +1618,7 @@ export default {
         sapName: null,
         factoryWorkshop: null,
         sapAsset: null,
+        dh: null,
       };
       this.resetForm("form");
     },

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) {