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

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

@@ -8,10 +8,11 @@
       style="width: 200px;" 
       :multiple="multiple" collapse-tags>
       <el-option 
-        v-for="item in dictOptions" 
+        v-for="item in disabledOptions" 
         :key="item.dictValue" 
         :label="item.dictLabel" 
         :value="item.dictValue" 
+        :disabled="item.disabled"
       />
     </el-select>
     
@@ -152,11 +153,12 @@ export default {
   props: {
     dictType: { type: String, default: '' },
     editable: { type: Boolean, default: true },
-    kisv: { type: Boolean, default: false },
+    kisv: { type: Boolean, default: true },
     value: { type: String, default: '' },
     placeholder: { type: String, default: '请选择' },
     refresh: { type: Boolean, default: true },
     multiple: { type: Boolean, default: false },
+    disables: { type: String, default: '' },
   },
   data() {
     return {
@@ -199,7 +201,15 @@ export default {
           this.$emit('change', val)
         }
       }
-    }
+    },
+    disabledOptions() {
+      return this.dictOptions.map(item => {
+        return {
+          ...item,
+          disabled: this.disabledFormat(item.dictValue)
+        }
+      })
+    },
   },
   watch: {
     dictType: {
@@ -235,6 +245,13 @@ export default {
       this.dictId = res.rows[0].dictId
       return this.dictId
     },
+    disabledFormat(item) {
+      if (this.disables) {
+        const list = this.disables.split(',')
+        return list.includes(item)
+      }
+      return false
+    },
     // 新增：刷新字典数据
     async handleRefresh() {
       this.loading = true

klp-ui/src/views/wms/hrm/records/meal.vue

@@ -163,11 +163,11 @@
           <DictSelect dictType="hrm_department" v-model="form.deptName" placeholder="请选择部门名称"></DictSelect>
         </el-form-item>
         <el-form-item label="堂食成员" prop="dineInPeopleList">
-          <dict-select dictType="hrm_leave_employee" v-model="form.dineInPeopleList" placeholder="请选择堂食成员" multiple @change="handleDineInPeopleChange"/>
+          <dict-select dictType="hrm_leave_employee" v-model="form.dineInPeopleList" placeholder="请选择堂食成员" multiple @change="handleDineInPeopleChange" :disables="form.takeoutPeopleList"/>
           <div>（{{ form.dineInPeople || 0 }}人）</div>
         </el-form-item>
         <el-form-item label="打包成员" prop="takeoutPeopleList">
-          <dict-select dictType="hrm_leave_employee" v-model="form.takeoutPeopleList" placeholder="请选择打包成员" multiple @change="handleTakeoutPeopleChange"/>
+          <dict-select dictType="hrm_leave_employee" v-model="form.takeoutPeopleList" placeholder="请选择打包成员" multiple @change="handleTakeoutPeopleChange" :disables="form.dineInPeopleList"/>
           <div>（{{ form.takeoutPeople || 0 }}人）</div>
         </el-form-item>
         <el-form-item label="用餐总人数" prop="totalPeople">

klp-ui/src/views/wms/report/zha/day.vue

@@ -326,7 +326,7 @@ export default {
         // actionStatus: 2,
         warehouseId: this.queryParams.planId,
         // actionType: 401,
-        actionType: 200, // 分条工序
+        actionType: 120, // 分条工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,

klp-ui/src/views/wms/report/zha/month.vue

@@ -347,7 +347,7 @@ export default {
         // actionStatus: 2,
         warehouseId: this.queryParams.planId,
         // actionType: 401,
-        actionType: 200, // 分条工序
+        actionType: 120, // 分条工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,

klp-ui/src/views/wms/report/zha/team.vue

@@ -402,7 +402,7 @@ export default {
         // actionStatus: 2,
         warehouseId: this.queryParams.planId,
         // actionType: 401,
-        actionType: 200, // 分条工序
+        actionType: 120, // 分条工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,

klp-ui/src/views/wms/report/zha/year.vue

@@ -331,7 +331,7 @@ export default {
         // actionStatus: 2,
         warehouseId: this.queryParams.planId,
         // actionType: 401,
-        actionType: 200, // 分条工序
+        actionType: 120, // 分条工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,

klp-ui/src/views/wms/report/zha_.vue

@@ -195,7 +195,7 @@ export default {
         // actionStatus: 2,
         warehouseId: this.queryParams.planId,
         // actionType: 401,
-        actionType: 200, // 分条工序
+        actionType: 120, // 分条工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,

klp-ui/src/views/wms/report/zinc/day.vue

@@ -312,7 +312,7 @@ export default {
         // actionStatus: 2,
         warehouseId: this.queryParams.planId,
         // actionType: 401,
-        actionType: 200, // 分条工序
+        actionType: 120, // 分条工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,

klp-ui/src/views/wms/report/zinc/month.vue

@@ -333,7 +333,7 @@ export default {
         // actionStatus: 2,
         warehouseId: this.queryParams.planId,
         // actionType: 401,
-        actionType: 200, // 分条工序
+        actionType: 120, // 分条工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,

klp-ui/src/views/wms/report/zinc/team.vue

@@ -389,7 +389,7 @@ export default {
         // actionStatus: 2,
         warehouseId: this.queryParams.planId,
         // actionType: 401,
-        actionType: 200, // 分条工序
+        actionType: 120, // 分条工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,

klp-ui/src/views/wms/report/zinc/year.vue

@@ -315,7 +315,7 @@ export default {
         // actionStatus: 2,
         warehouseId: this.queryParams.planId,
         // actionType: 401,
-        actionType: 200, // 分条工序
+        actionType: 120, // 分条工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,

klp-ui/src/views/wms/report/zinc_.vue

@@ -195,7 +195,7 @@ export default {
         // actionStatus: 2,
         warehouseId: this.queryParams.planId,
         // actionType: 401,
-        actionType: 200, // 分条工序
+        actionType: 120, // 分条工序
         pageSize: 999,
         pageNum: 1,
         startTime: this.queryParams.byCreateTimeStart,