Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/api/wms/pendingAction.js

@@ -127,7 +127,7 @@ export function completeAction(actionId, newCoilIds) {
     url: `/wms/coilPendingAction/complete/${actionId}`,
     method: 'put',
     params: {
-      newCoilIds: newCoilIds
+      newCoilIds: newCoilIds || '-'
     }
   })
 }

klp-ui/src/components/MutiSelect/index.vue

@@ -1,25 +1,34 @@
 <template>
   <div class="muti-select">
     <!-- 下拉选择模式 -->
-    <el-select
-      v-if="type === 'select'"
-      v-model="innerValue"
-      multiple
-      :placeholder="placeholder"
-      :filterable="filterable"
-      :clearable="clearable"
-      :allow-create="allowAdd"
-      :disabled="disabled"
-      :size="size"
-      @change="handleChange"
-    >
-      <el-option
-        v-for="item in options"
-        :key="item.value"
-        :label="item.label"
-        :value="item.value"
-      />
-    </el-select>
+    <div v-if="type === 'select'" class="select-container">
+      <el-select
+        v-model="innerValue"
+        multiple
+        :placeholder="placeholder"
+        :filterable="filterable"
+        :clearable="clearable"
+        :allow-create="allowAdd"
+        :disabled="disabled"
+        :size="size"
+        @change="handleChange"
+      >
+        <!-- 全选选项 -->
+        <el-option
+          v-if="showSelectAll && options.length > 0"
+          key="selectAll"
+          label="全选"
+          value="selectAll"
+          @click="toggleSelectAll"
+        />
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+    </div>
 
     <!-- 复选框模式 -->
     <div v-else-if="type === 'checkbox'" class="checkbox-group">
@@ -33,14 +42,14 @@
           {{ item.label }}
         </el-checkbox>
       </el-checkbox-group>
-      <!-- <el-button
+      <el-button
         v-if="showSelectAll && options.length > 0"
         type="text"
         size="small"
         @click="toggleSelectAll"
       >
         {{ isAllSelected ? '取消全选' : '全选' }}
-      </el-button> -->
+      </el-button>
     </div>
   </div>
 </template>
@@ -114,7 +123,9 @@
     methods: {
       // 处理选择变化
       handleChange(val) {
-        this.$emit('change', val.join(','));
+        // 过滤掉 'selectAll' 选项
+        const filteredVal = val.filter(item => item !== 'selectAll');
+        this.$emit('change', filteredVal.join(','));
       },
       // 处理复选框变化
       handleCheckboxChange(val) {

klp-ui/src/views/wms/coil/components/AbnormalForm.vue

@@ -82,10 +82,10 @@ export default {
           { required: true, message: '请选择位置', trigger: 'change' },
           { validator: this.validateArray, trigger: 'change' }
         ],
-        plateSurface: [
-          { required: true, message: '请选择上下板面', trigger: 'change' },
-          { validator: this.validateArray, trigger: 'change' }
-        ],
+        // plateSurface: [
+        //   { required: true, message: '请选择上下板面', trigger: 'change' },
+        //   { validator: this.validateArray, trigger: 'change' }
+        // ],
         startPosition: [
           { required: true, message: '请输入开始位置', trigger: ['blur', 'change'] },
           { validator: this.validateStartPosition, trigger: ['blur', 'change'] }

klp-ui/src/views/wms/coil/components/ExceptionManager.vue

@@ -56,7 +56,7 @@
       <div class="section-header">
         <h4 class="section-title">异常记录</h4>
         <div>
-          <el-button type="primary" size="mini" @click="handleSave">保存</el-button>
+          <el-button type="primary" size="mini" @click="handleSave" :loading="buttonLoading">保存</el-button>
           <el-button type="default" icon="el-icon-refresh" plain size="mini" @click="refreshAbnormalList"
             :loading="abnormalLoading">
             刷新
@@ -291,10 +291,10 @@ export default {
           this.$message.error(`第${rowIndex}行：请选择断面位置`)
           return
         }
-        if (!row.plateSurface || row.plateSurface.length === 0) {
-          this.$message.error(`第${rowIndex}行：请选择上下板面`)
-          return
-        }
+        // if (!row.plateSurface || row.plateSurface.length === 0) {
+        //   this.$message.error(`第${rowIndex}行：请选择上下板面`)
+        //   return
+        // }
         if (!row.defectCode) {
           this.$message.error(`第${rowIndex}行：请选择缺陷代码`)
           return
@@ -445,7 +445,7 @@ export default {
 
 .exception-section {
   background-color: #fafafa;
-  border-radius: 4px;
+  border-radius: 4px; 
   padding: 16px;
   border: 1px solid #e4e7ed;
 }

klp-ui/src/views/wms/report/js/config.js

@@ -1,7 +1,7 @@
 export const dugeConfig = {
   actionTypes: [505, 120],
   actionQueryParams: {
-    createBy: 'dugekuguan'
+    createBys: 'dugekuguan'
   },
   baseQueryParams: {
     createBy: 'dugekuguan',
@@ -19,7 +19,7 @@ export const dugeConfig = {
 export const lajiaoConfig = {
   actionTypes: [503, 120],
   actionQueryParams: {
-    updateBy: 'lajiaokuguan'
+    updateBys: 'lajiaokuguan'
   },
   baseQueryParams: {
     createBy: 'lajiaokuguan',
@@ -37,7 +37,7 @@ export const lajiaoConfig = {
 export const shuangConfig = {
   actionTypes: [504, 120],
   actionQueryParams: {
-    createBy: 'shuangkuguan'
+    createBys: 'shuangkuguan'
   },
   baseQueryParams: {
     createBy: 'shuangkuguan',
@@ -55,7 +55,7 @@ export const shuangConfig = {
 export const tuozhiConfig = {
   actionTypes: [502, 120],
   actionQueryParams: {
-    createBy: 'tuozhikuguan'
+    createBys: 'tuozhikuguan'
   },
   baseQueryParams: {
     createBy: 'tuozhikuguan',
@@ -73,7 +73,7 @@ export const tuozhiConfig = {
 export const suanzhaConfig = {
   actionTypes: [11, 120],
   actionQueryParams: {
-    createBy: 'suanzhakuguan'
+    createBys: 'suanzhakuguan,yuanliaoku'
   },
   baseQueryParams: {
     createBy: 'suanzhakuguan',
@@ -94,7 +94,7 @@ export const suanzhaConfig = {
 export const zincConfig = {
   actionTypes: [501, 120],
   actionQueryParams: {
-    createBy: 'duxinkuguan'
+    createBys: 'duxinkuguan'
   },
   baseQueryParams: {
     createBy: 'duxinkuguan',
@@ -113,7 +113,7 @@ export const zincConfig = {
 export const splitConfig = {
   actionTypes: [506],
    actionQueryParams: {
-    createBy: 'fenjiankuguan'
+    createBys: 'fenjiankuguan'
   },
   baseQueryParams: {
     createBy: 'fenjiankuguan',

klp-ui/src/views/wms/report/js/fetch.js

@@ -42,7 +42,7 @@ export async function fetchLossList(actionTypes, queryParams, callback) {
     return listPendingAction({
       actionStatus: 2,
       actionType,
-      createBy: queryParams.createBy,
+      createBys: queryParams.createBys,
       startTime: queryParams.byCreateTimeStart,
       endTime: queryParams.byCreateTimeEnd,
       pageSize: 99999,
@@ -63,6 +63,7 @@ export async function fetchLossList(actionTypes, queryParams, callback) {
     ...queryParams,
     byCreateTimeStart: undefined,
     byCreateTimeEnd: undefined,
+    createBys: undefined,
     createBy: undefined,
     actionIds: actionIds,
     pageSize: 99999,

klp-ui/src/views/wms/report/template/loss.vue

@@ -68,10 +68,6 @@
 </template>
 
 <script>
-import { listCoilWithIds } from "@/api/wms/coil";
-import {
-  listPendingAction,
-} from '@/api/wms/pendingAction';
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";

klp-ui/src/views/wms/report/template/out.vue

@@ -68,7 +68,6 @@
 </template>
 
 <script>
-import { listCoilWithIds } from "@/api/wms/coil";
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";