src/api/base/coreWorkOrder.js

@@ -1,8 +1,8 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-10-21 11:50:46
- * @LastEditTime: 2023-11-15 17:19:19
+ * @LastEditTime: 2024-12-27 15:20:14
- * @LastEditors: DY
+ * @LastEditors: zwq
  * @Description:
  */
 import request from '@/utils/request'
@@ -161,3 +161,20 @@ export function createConCoreWOr(data) {
     data: data
   })
 }
+
+// 更新分配产量
+export function updateBatch(data) {
+  return request({
+    url: '/base/core-order-con-work-order/updateBatch',
+    method: 'put',
+    data: data
+  })
+}
+// 更新订单表与工单关联表 多对多
+export function updateConCoreWOr(data) {
+  return request({
+    url: '/base/core-order-con-work-order/update',
+    method: 'put',
+    data: data
+  })
+}

src/api/base/groupSchedulingRule.js

@@ -8,7 +8,13 @@ export function createGroupRule(data) {
     data: data
   })
 }
-
+// 作废排班规则
+export function disableGroupRule(id) {
+  return request({
+    url: '/base/group-scheduling-rule/disable?id=' + id,
+    method: 'post',
+  })
+}
 // 更新排班规则基础信息
 export function updateGroupRule(data) {
   return request({

src/api/base/product.js

@@ -1,8 +1,16 @@
 import request from '@/utils/request'
-// 获得产品列表
+// 获得物料列表（包括产品）
 export function getProductAll() {
   return request({
     url: '/base/core-product-material/listAll',
     method: 'get'
   })
 }
+// 获得产品列表
+export function getProductList() {
+  return request({
+    url: '/base/core-product-material/listAllProduct',
+    method: 'get'
+  })
+}
+

src/api/equipment/base/maintain/items.js

@@ -23,6 +23,13 @@ export function getItemPageData(data) {
   })
 }
 
+export function getByEquId(id) {
+  return request({
+    url: '/base/equipment-maintain-program/getByEquId?id=' + id,
+    method: 'get',
+  })
+}
+
 export function getItemData(id) {
   return request({
     url: 'base/equipment-maintain-program/get?id=' + id,

src/views/delivery/deliveryLog/components/addOrUpdate.vue

@@ -38,15 +38,8 @@
     </el-row>
     <el-row :gutter="20">
       <el-col :span='6'>
-        <el-form-item label="发货负责人" prop="deliveryPersonId">
+        <el-form-item label="发货负责人" prop="deliveryPerson">
-          <el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;" filterable>
+          <el-input v-model="form.deliveryPerson"></el-input>
-            <el-option
-              v-for="item in personList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
         </el-form-item>
       </el-col>
       <el-col :span='6'>
@@ -75,7 +68,6 @@
   </el-form>
 </template>
 <script>
-import { getWorkerList } from '@/api/base/worker'
 import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog, listOrderList } from '@/api/base/delivery'
 export default {
   name: 'AddOrUpdate',
@@ -87,7 +79,7 @@ export default {
         name: '',
         code: '',
         deliveryTime: null,
-        deliveryPersonId: '',
+        deliveryPerson: '',
         principal: '',
         principalCall: '',
         principalCost: 0.00,
@@ -100,7 +92,6 @@ export default {
         code: [{ required: true, message: "发货单号不能为空", trigger: "blur" }]
       },
       orderList: [],
-      personList: []
     }
   },
   methods: {
@@ -118,9 +109,6 @@ export default {
       listOrderList().then(res => {
         this.orderList = res.data || []
       })
-      getWorkerList().then(res => {
-        this.personList = res.data || []
-      })
     },
     submitForm() {
       this.$refs['addOrUpdate'].validate((valid) => {

src/views/equipment/base/inspection/Confirm/add-or-updata.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
- * @LastEditors: zhp
+ * @LastEditors: zwq
- * @LastEditTime: 2024-07-31 09:48:36
+ * @LastEditTime: 2024-11-18 09:51:03
  * @Description:
 -->
 <template>
@@ -393,9 +393,12 @@ export default {
 						// }
 						this.$axios({
 							url:
-								`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
+								`/base/equipment-check-order/confirm`,
 								method: 'put',
-								data: [this.dataForm.id],
+								data: {
+									ids: [this.dataForm.id],
+									confirmBy: this.$store.getters.nickname,
+								},
 						}).then(res =>{
 							if (res.code == 0) {
 								this.visible = false;

src/views/equipment/base/inspection/Confirm/index.vue

@@ -42,9 +42,7 @@
 import AddOrUpdate from './add-or-updata';
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import {
+import { exportCheckOrderExcel } from '@/api/equipment/base/maintain/record';
-	exportCheckOrderExcel,
-} from '@/api/equipment/base/maintain/record';
 import WaitingListTable from './WaitingListTable.vue';
 
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
@@ -76,16 +74,14 @@ export default {
 	name: 'Confirm',
 	components: {
 		WaitingListTable,
-		AddOrUpdate
+		AddOrUpdate,
 	},
 	mixins: [basicPageMixin],
 	data() {
 		return {
 			addOrUpdateVisible: false,
 			recordDetailVisible: false,
-			searchBarKeys: [
+			searchBarKeys: ['name'],
-				'name'
-			],
 			tobeConfirmedIdList: [],
 			searchBarFormConfig: [
 				{
@@ -100,46 +96,51 @@ export default {
 					name: 'search',
 					color: 'primary',
 				},
-        {
-          type: (this.$auth.hasPermiAnd([
-            'equipment:check-record:create',
-            'base:core-worker:query',
-            'base:core-production-line:query',
-            'base:core-department:query'
-          ]) || this.$auth.hasPermi('equipment:check-record:update') || this.$auth.hasPermi('equipment:check-record:export')) ? 'separate' : '',
-        },
-        {
-          type: this.$auth.hasPermiAnd([
-            'equipment:check-record:create',
-            'base:core-worker:query',
-            'base:core-production-line:query',
-            'base:core-department:query'
-          ])
-            ? 'button'
-            : '',
-          btnName: '新增',
-          name: 'add',
-          plain: true,
-          color: 'success',
-        },
 				{
-          type: this.$auth.hasPermi('equipment:check-record:update')
+					type:
+						this.$auth.hasPermiAnd([
+							'equipment:check-record:create',
+							'base:core-worker:query',
+							'base:core-production-line:query',
+							'base:core-department:query',
+						]) ||
+						this.$auth.hasPermi('equipment:check-record:update') ||
+						this.$auth.hasPermi('equipment:check-record:export')
+							? 'separate'
+							: '',
+				},
+				{
+					type: this.$auth.hasPermiAnd([
+						'equipment:check-record:create',
+						'base:core-worker:query',
+						'base:core-production-line:query',
+						'base:core-department:query',
+					])
+						? 'button'
+						: '',
+					btnName: '新增',
+					name: 'add',
+					plain: true,
+					color: 'success',
+				},
+				{
+					type: this.$auth.hasPermi('equipment:check-record:update')
 						? 'button'
 						: '',
 					btnName: '巡检人批量确认',
 					name: 'batchConfirm',
 					color: 'primary',
 					plain: true,
-        },
+				},
-        {
+				{
-          type: this.$auth.hasPermi('equipment:check-record:update')
+					type: this.$auth.hasPermi('equipment:check-record:update')
-            ? 'button'
+						? 'button'
-            : '',
+						: '',
-          btnName: '确认人批量确认',
+					btnName: '确认人批量确认',
-          name: 'batchConfirm2',
+					name: 'batchConfirm2',
-          color: 'primary',
+					color: 'primary',
-          plain: true,
+					plain: true,
-        },
+				},
 				// {
 				// 	type: this.$auth.hasPermi('equipment:check-record:export')
 				// 		? 'button'
@@ -211,11 +212,14 @@ export default {
 							// }
 							return this.$axios({
 								// url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
-								url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
+								url: `/base/equipment-check-order/confirm`,
 								method: 'put',
-								data: this.$refs['waiting-list-table'].selectedPlan.map(
+								data: {
-									(item) => item.id
+									ids: this.$refs['waiting-list-table'].selectedPlan.map(
-								),
+										(item) => item.id
+									),
+									confirmBy: this.$store.getters.nickname,
+								},
 							});
 						})
 						.then((res) => {
@@ -223,35 +227,38 @@ export default {
 							res.code == 0 && this.$modal.msgSuccess('确认成功');
 							res.code != 0 && this.$modal.msgError('确认失败');
 						})
-            .catch(() => { });
+						.catch(() => {});
-        case 'batchConfirm2':
+				case 'batchConfirm2':
-          if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
+					if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
-            this.$message.warning('请选择待确认的设备巡检单');
+						this.$message.warning('请选择待确认的设备巡检单');
-            return;
+						return;
-          }
+					}
-          this.$modal
+					this.$modal
-            .confirm('是否确认所有选中巡检单"?')
+						.confirm('是否确认所有选中巡检单"?')
-            .then(() => {
+						.then(() => {
-              // let checkPersonParam = '';
+							// let checkPersonParam = '';
-              // if (!row.checkPerson || row.checkPerson.trim() == '') {
+							// if (!row.checkPerson || row.checkPerson.trim() == '') {
-              // 	/** 如有必要，更新巡检人 */
+							// 	/** 如有必要，更新巡检人 */
-              // 	checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
+							// 	checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
-              // }
+							// }
-              return this.$axios({
+							return this.$axios({
-                // url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
+								// url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
-                url: `/base/equipment-check-order/confirm2?confirmPerson=${this.$store.getters.nickname}`,
+								url: `/base/equipment-check-order/confirm2`,
-                method: 'put',
+								method: 'put',
-                data: this.$refs['waiting-list-table'].selectedPlan.map(
+								data: {
-                  (item) => item.id
+									ids: this.$refs['waiting-list-table'].selectedPlan.map(
-                ),
+										(item) => item.id
-              });
+									),
-            })
+									confirmBy: this.$store.getters.nickname,
-            .then((res) => {
+								},
-              this.getList();
+							});
-              res.code == 0 && this.$modal.msgSuccess('确认成功');
+						})
-              res.code != 0 && this.$modal.msgError('确认失败');
+						.then((res) => {
-            })
+							this.getList();
-            .catch(() => { });
+							res.code == 0 && this.$modal.msgSuccess('确认成功');
+							res.code != 0 && this.$modal.msgError('确认失败');
+						})
+						.catch(() => {});
 					break;
 			}
 		},
@@ -311,7 +318,7 @@ export default {
 		},
 
 		handleSearchBarChange({ param, value }) {
-			console.log('122', param)
+			console.log('122', param);
 			// if ('specialType' === param) {
 			// 	if (!value) {
 			// 		this.setSearchBarEquipmentList(this.allSpecialEquipments);
@@ -327,7 +334,7 @@ export default {
 			this.loading = true;
 			// 执行查询
 			this.recv({
-				...this.queryParams
+				...this.queryParams,
 			}).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
@@ -376,18 +383,18 @@ export default {
 			// this.title = '添加待确认保养记录';
 			// this.addOrEditTitle = '新增';
 			this.addOrUpdateVisible = true;
-      this.$nextTick(() => {
+			this.$nextTick(() => {
-        this.$refs.addOrUpdate.init();
+				this.$refs.addOrUpdate.init();
-      });
+			});
 		},
 
 		// 新增 / 修改
-    // addOrUpdateHandle(id) {
+		// addOrUpdateHandle(id) {
-    //   this.addOrUpdateVisible = true;
+		//   this.addOrUpdateVisible = true;
-    //   this.$nextTick(() => {
+		//   this.$nextTick(() => {
-    //     this.$refs.addOrUpdate.init(id);
+		//     this.$refs.addOrUpdate.init(id);
-    //   });
+		//   });
-    // },
+		// },
 
 		getConfirmed() {
 			return this.$confirm('是否直接确认巡检记录', '提示', {
@@ -462,10 +469,12 @@ export default {
 					// 	checkPersonParam = `&checkPerson=${row.checkPerson}`
 					// }
 					return this.$axios({
-						url:
+						url: `/base/equipment-check-order/confirm`,
-							`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
 						method: 'put',
-						data: [row.id],
+						data: {
+									ids: [row.id],
+									confirmBy: this.$store.getters.nickname,
+								},
 					});
 				})
 				.then((res) => {
@@ -478,9 +487,9 @@ export default {
 		/** 编辑 */
 		async handleEdit(row) {
 			this.addOrUpdateVisible = true;
-      this.$nextTick(() => {
+			this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(row.id);
+				this.$refs.addOrUpdate.init(row.id);
-      });
+			});
 			// this.reset();
 			// if (row.relatePlan == 1) {
 			// 	// 计划型
@@ -501,9 +510,7 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			this.$modal
-				.confirm(
+				.confirm('是否确认删除巡检单名称为"' + row.name + '"的数据项?')
-					'是否确认删除巡检单名称为"' + row.name + '"的数据项?'
-				)
 				.then(() => {
 					return this.$axios({
 						url: '/base/equipment-check-order/delete?id=' + row.id,
@@ -518,9 +525,9 @@ export default {
 		},
 		handleDetail(row) {
 			this.addOrUpdateVisible = true;
-      this.$nextTick(() => {
+			this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(row.id, true);
+				this.$refs.addOrUpdate.init(row.id, true);
-      });
+			});
 			// this.recordDetailVisible = true;
 			// this.$nextTick(() => {
 			// 	this.$refs.recordDetailDrawer.show({

src/views/equipment/base/maintain/Confirm/WaitingListUnplanned--edit.vue

@@ -392,10 +392,12 @@ export default {
 						console.log('111', confirm)
 						this.$axios({
 							url:
-								'/base/equipment-maintain-log/confirm?confirmPerson=' +
+								'/base/equipment-maintain-log/confirm',
-								this.$store.getters.userId,
 								method: 'put',
-								data: [this.form.id],
+								data: {
+									ids: [this.form.id],
+									confirmBy: this.$store.getters.nickname,
+								},
 						}).then(res =>{
 							if (res.code == 0) {
 								this.visible = false;

src/views/equipment/base/maintain/Confirm/index.vue

@@ -287,9 +287,12 @@ export default {
 							return this.$axios({
 								url: '/base/equipment-maintain-log/confirm',
 								method: 'put',
-								data: this.$refs['waiting-list-table'].selectedPlan.map(
+								data:{
-									(item) => item.id
+									ids: this.$refs['waiting-list-table'].selectedPlan.map(
-								),
+										(item) => item.id
+									),
+									confirmBy: this.$store.getters.nickname,
+								},
 							});
 					// if (res.code == 0) {
 					// 	this.$message.success('确认成功');
@@ -313,9 +316,12 @@ export default {
               return this.$axios({
                 url: '/base/equipment-maintain-log/confirm2',
                 method: 'put',
-                data: this.$refs['waiting-list-table'].selectedPlan.map(
+                data: {
-                  (item) => item.id
+									ids: this.$refs['waiting-list-table'].selectedPlan.map(
-                ),
+										(item) => item.id
+									),
+									confirmBy: this.$store.getters.nickname,
+								},
               });
               // if (res.code == 0) {
               // 	this.$message.success('确认成功');
@@ -547,7 +553,10 @@ export default {
 					return this.$axios({
 						url: '/base/equipment-maintain-log/confirm',
 						method: 'put',
-						data: [row.id],
+						data: {
+									ids: [row.id],
+									confirmBy: this.$store.getters.nickname,
+								},
 					});
 			// if (res.code == 0) {
 			// 	this.$message.success('确认成功');

src/views/equipment/base/maintain/PlanConfig/attr-add.vue

@@ -37,7 +37,7 @@
 <script>
 import { createPlanDet, updatePlanDet, getPlanDet } from '@/api/equipment/base/maintain/planconfig';
 import { getEquipmentPage } from '@/api/base/equipment'
-import { getItemPageData } from '@/api/equipment/base/maintain/items';
+import { getByEquId } from '@/api/equipment/base/maintain/items';
 
 export default {
 	props: {
@@ -94,20 +94,14 @@ export default {
 			});
     },
     async handleChange(val) {
-      console.log(val);
+      // let equipmentTypeId = undefined
-      let equipmentTypeId = undefined
+      // this.eqList.forEach((ele) => {
-      this.eqList.forEach((ele) => {
+      //   if (ele.id == val) {
-        if (ele.id == val) {
+      //     equipmentTypeId = ele.equipmentTypeId
-          equipmentTypeId = ele.equipmentTypeId
+      //   }
-        }
+      // })
-      })
+      const { code, data } = await getByEquId(val)
-      const { code, data } = await getItemPageData({
+      this.programList = data
-        pageNo: 1,
-        pageSize: 99,
-        equipmentTypeId: equipmentTypeId,
-      })
-      this.programList = data.list
-      console.log(data);
     },
     handleDecChange(val) {
       let maintenanceDes = undefined

src/views/equipment/base/maintain/items/components/add-or-updata.vue

@@ -70,6 +70,12 @@ import { getList,} from "@/api/base/qualityScrapType";
 
 export default {
 	mixins: [basicAdd],
+
+  props: {
+    mainId: {
+      type: String,
+    },
+  },
 	data() {
 		return {
 			urlOptions: {
@@ -96,7 +102,7 @@ export default {
         id: undefined,
         program: undefined,
         resultType: undefined,
-        equipmentTypeId: undefined,
+        mainId:this.mainId,
         minValue: undefined,
         maxValue: undefined,
         maintainResult:undefined,
@@ -117,7 +123,6 @@ export default {
 	},
 	mounted() {
 		this.getDict()
-		console.log('我看看', this.dataForm)
 	},
   methods: {
     handleClear() {

src/views/equipment/base/maintain/items/components/basic-add.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
- * @LastEditors: zhp
+ * @LastEditors: zwq
- * @LastEditTime: 2024-07-19 14:47:02
+ * @LastEditTime: 2024-12-13 15:50:49
  * @Description:
  */
 export default {
@@ -28,10 +28,8 @@ export default {
   activated() {
   },
   methods: {
-    init(obj) {
+    init(id) {
-      console.log(obj);
+      this.dataForm.id = id || "";
-      this.dataForm.id = obj.id || "";
-      this.dataForm.equipmentTypeId = obj.equipmentTypeId || "";
       this.visible = true;
       if (this.urlOptions.getOption) {
         this.getArr()

src/views/equipment/base/maintain/items/components/basic-page.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zhp
  * @Date: 2024-07-19 09:49:22
- * @LastEditTime: 2024-07-22 09:17:31
+ * @LastEditTime: 2024-12-13 15:52:24
- * @LastEditors: zhp
+ * @LastEditors: zwq
  * @Description:
  */
 export default {
@@ -88,12 +88,8 @@ export default {
       if (val.type === "edit") {
         this.addOrUpdateVisible = true;
         this.addOrEditTitle = "编辑"
-        let obj = {
-          id: val.data.id,
-          equipmentTypeId:val.data.equipmentTypeId
-        }
         this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(obj);
+          this.$refs.addOrUpdate.init(val.data.id);
         });
       } else if (val.type === "delete") {
         this.deleteHandle(val.data.id, val.data.program, val.data._pageIndex)

src/views/equipment/base/maintain/items/index.vue

@@ -186,7 +186,7 @@ export default {
     handleDetail(row) {
       this.showDetailVisible = true
       this.$nextTick(() => {
-        this.$refs.showDetail.init(row.equipmentTypeId)
+        this.$refs.showDetail.init(row.id)
       })
 				// alert('跳转到 保养记录')
 				// console.log(row)

src/views/equipment/base/maintain/items/showDetail.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2024-07-12 13:28:21
- * @LastEditTime: 2024-07-23 14:00:38
+ * @LastEditTime: 2024-12-13 16:03:29
- * @LastEditors: zhp
+ * @LastEditors: zwq
  * @Description:
 -->
 <template>
@@ -22,7 +22,7 @@
     </el-drawer>
     <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="addOrUpdateVisible" @cancel="handleCancel"
       @confirm="handleConfirm" :before-close="handleCancel" width="30%">
-      <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit"></add-or-update>
+      <add-or-update ref="addOrUpdate" @refreshDataList="successSubmit" :main-id="queryParams.mainId"></add-or-update>
     </base-dialog>
   </div>
 
@@ -74,7 +74,7 @@ export default {
         queryParams: {
           pageNo:1,
           pageSize:10,
-          equipmentTypeId:null,
+          mainId:null,
         },
         tableProps,
         basePath: 'base/equipment-maintain-program',
@@ -105,21 +105,18 @@ export default {
     },
     getDataList(id) {
       this.dataListLoading = true;
-      this.queryParams.equipmentTypeId = id
+      this.queryParams.mainId = id
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+      this.urlOptions.getDataListURL(this.queryParams).then(response => {
         this.tableData = response.data.list;
-        this.listQuery.total = response.data.total;
+        this.queryParams.total = response.data.total;
         this.dataListLoading = false
       });
     },
     handleAdd() {
       this.addOrUpdateVisible = true
       this.addOrEditTitle = '新增'
-      let obj = {
-        equipmentTypeId: this.queryParams.equipmentTypeId
-      }
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(obj)
+        this.$refs.addOrUpdate.init()
       });
     },
     init(id) {

src/views/extend/processFlow/index.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: index.vue
     author: liubin
     date: 2023-10-19 10:03:42
-    description: 
+    description:
 -->
 
 <template>
@@ -189,7 +189,7 @@ export default {
 						input: true,
 						label: '工艺编码',
 						prop: 'code',
-						// url: '/base/core-equipment/getCode',
+						url: '/extend/process-flow/getCode',
 					},
 				],
 				[

src/views/group/base/groupClasses/index.vue

@@ -76,10 +76,10 @@ const tableProps = [
 		label: '班次状态',
 		subcomponent: StatusBtn,
 	},
-	{
+	// {
-		prop: 'remark',
+	// 	prop: 'remark',
-		label: '备注',
+	// 	label: '备注',
-	},
+	// },
 ];
 export default {
 	name: 'GroupClass',

src/views/group/base/groupTeamScheduling/index.vue

@@ -82,7 +82,7 @@
 						</div>
 						<!-- 班次班组 -->
 						<!-- class有两个样式，一个是类似class1，还有个是选中红框显示 -->
-						<el-row
+						<!-- <el-row
 							:gutter="2"
 							:class="
 								'class' +
@@ -92,6 +92,14 @@
 									: '')
 							"
 							v-for="(item, index) in list[Number(data.day.split('-')[2])]"
+							:key="index"> -->
+						<el-row
+							:gutter="2"
+							:class="
+								'class' +
+								(index + 1)
+							"
+							v-for="(item, index) in list[Number(data.day.split('-')[2])]"
 							:key="index">
 							<el-col :span="12">
 								<div class="selectDiv">
@@ -141,6 +149,9 @@
 							</el-col>
 						</el-row>
 					</div>
+					<div v-else style='font-size: 20px;font-weight: 500;text-align: right;'>
+						{{ Number(data.day.split('-')[2]) }}
+					</div>
 				</template>
 			</el-calendar>
 		</div>

src/views/group/base/schedulingPlanConfig/components/schedulingPlanConfigAdd.vue

@@ -211,6 +211,9 @@ export default {
 										this.$modal.msgSuccess('操作成功');
 										this.$emit('successSubmit');
 									});
+								}else{
+									this.$modal.msgSuccess('操作成功');
+									this.$emit('successSubmit');
 								}
 							}
 						});
@@ -226,6 +229,9 @@ export default {
 										this.$modal.msgSuccess('操作成功');
 										this.$emit('successSubmit');
 									});
+								}else{
+									this.$modal.msgSuccess('操作成功');
+									this.$emit('successSubmit');
 								}
 							}
 						});

src/views/group/base/schedulingPlanConfig/index.vue

@@ -176,7 +176,7 @@ export default {
 				if (res.code === 0 && res.data.list && res.data.list.length > 0) {
           res.data.list.forEach(item => {
             if(item.isProduction){
-              item.str = item.strList?item.strList.join(','):'-'
+              item.str = item.strList?item.strList.join('，'):'-'
             }
           });
 					this.list = res.data.list;

src/views/group/base/schedulingRuleConfig/index.vue

@@ -44,6 +44,7 @@ import {
 	deleteGroupRule,
 	updateGroupRule,
 	getGroupRule,
+	disableGroupRule
 } from '@/api/base/groupSchedulingRule';
 import schedulingRuleConfigAdd from './components/schedulingRuleConfigAdd.vue';
 import { formatDate } from '@/utils';
@@ -231,14 +232,9 @@ export default {
 						'是否确认作废序号为"' + row.planName + '"的数据项?'
 					,'提示')
 				.then(() => {
-					getGroupRule(row.id).then((response) => {
+					disableGroupRule(row.id).then((response) => {
-						let datas = response.data;
-						datas.list = datas.sequenceList;
-						datas.enabled = 0;
-						updateGroupRule(datas).then(() => {
 							_this.getList();
 							_this.$modal.msgSuccess('操作成功');
-						});
 					});
 				})
 				.catch(() => {});

src/views/group/monitoring/teamProduction/index.vue

@@ -18,7 +18,7 @@
         v-if="tableBtn.length"
         slot="handleBtn"
         :width="80"
-        label="操作"
+        label="生产情况"
         :method-list="tableBtn"
         @clickBtn="handleClick"
       />
@@ -122,8 +122,8 @@ export default {
       tableBtn: [
       this.$auth.hasPermi('base:team-production:detail')
           ? {
-              type: 'detail',
+              type: 'prodDetail',
-              btnName: '详情'
+              btnName: '查看'
             }
           : undefined
       ].filter((v) => v),

src/views/material/material/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-14 15:24:11
+ * @LastEditTime: 2024-12-12 09:54:25
  * @Description:
 -->
 <template>
@@ -83,7 +83,7 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="8" v-if="showTime">
-				<el-form-item label="生产单位用时" prop="processTime">
+				<el-form-item label="生产单位用时(s)" prop="processTime">
 					<el-input
 						v-model.number="dataForm.processTime"
 						type="number"

src/views/material/material/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-07-01 14:54:06
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-21 11:19:51
+ * @LastEditTime: 2024-12-16 10:03:30
  * @Description:
 -->
 <template>
@@ -346,6 +346,7 @@ export default {
 			this.listQuery.typeId = data.id || undefined;
 			this.listQuery.product = data.product;
 			this.$refs.searchBarForm.formInline.type = data.name || undefined;
+      this.getDataList()
 		},
 		// 新增节点
 		append(data) {

src/views/material/materialUseLog/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-10-14 09:26:53
+ * @LastEditTime: 2024-12-12 16:13:11
  * @Description:
 -->
 <template>
@@ -41,18 +41,19 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
-				<el-form-item label="物料批次" prop="materialDateId">
+				<el-form-item label="物料批次" prop="materialDate">
 					<el-select
-						v-model="dataForm.materialDateId"
+						v-model="dataForm.materialDate"
 						clearable
 						filterable
+						allow-create
 						placeholder="请选择物料批次"
 						style="width: 100%">
 						<el-option
 							v-for="dict in materialDateList"
 							:key="dict.id"
 							:label="dict.code"
-							:value="dict.id" />
+							:value="dict.code" />
 					</el-select>
 				</el-form-item>
 			</el-col>
@@ -147,7 +148,7 @@ import {
 	getMaterialLog,
 	getEqListAll,
 } from '@/api/base/materialUseLog';
-import { getMaterialTree,getMaterialList } from '@/api/base/material';
+import { getMaterialTree, getMaterialList } from '@/api/base/material';
 import { getMaterDateList } from '@/api/base/materialDate';
 import { listSimpleUsers } from '@/api/system/user';
 
@@ -164,7 +165,7 @@ export default {
 				id: undefined,
 				materialId: undefined,
 				materialCode: undefined,
-				materialDateId: undefined,
+				materialDate: undefined,
 				equipmentId: undefined,
 				userName: undefined,
 				userNames: [],
@@ -208,15 +209,17 @@ export default {
 	methods: {
 		async getDictData() {
 			const materRes = await getMaterialTree(); //
-      let typeId = materRes.data.find(item=>item.product === 0).id
+			let typeId = materRes.data.find((item) => item.product === 0).id;
-      const listQuery= {
+			const listQuery = {
-        typeId:typeId
+				typeId: typeId,
-      }
+			};
 			const materData = await getMaterialList(listQuery);
 			this.materialList = [];
 			this.materialList = materData.data;
-			const dateRes = await getMaterDateList();
+			if (!this.dataForm.id) {
-			this.materialDateList = dateRes.data;
+				const dateRes = await getMaterDateList();
+				this.materialDateList = dateRes.data;
+			}
 			const eqRes = await getEqListAll();
 			this.eqList = eqRes.data;
 			const workerRes = await listSimpleUsers();
@@ -257,7 +260,7 @@ export default {
 						this.dataForm.id = response.data.id;
 						this.dataForm.materialCode = response.data.materialCode;
 						this.dataForm.materialId = response.data.materialId;
-						this.dataForm.materialDateId = response.data.materialDateId;
+						this.dataForm.materialDate = response.data.materialDateName;
 						this.dataForm.equipmentId = response.data.equipmentId;
 						this.dataForm.useTime = response.data.useTime;
 						// this.dataForm.userName = response.data.userName
@@ -265,6 +268,11 @@ export default {
 						this.dataForm.source = response.data.source;
 						this.dataForm.remark = response.data.remark;
 						this.dataForm.userNames = response.data.userName.split(',');
+						getMaterDateList({ materialId: this.dataForm.materialId }).then(
+							(res) => {
+								this.materialDateList = res.data;
+							}
+						);
 					});
 				} else {
 				}

src/views/produce/order/base/orderManage/components/addWorkOrder.vue

@@ -8,7 +8,7 @@
 		<el-row :gutter="20">
 			<el-col :span="6">
 				<el-form-item label="工单模式">
-					<el-radio-group v-model="isBind">
+					<el-radio-group v-model="isBind" @input='toggleWay'>
 						<el-radio :label="true">绑定工单</el-radio>
 						<el-radio :label="false">新增工单</el-radio>
 					</el-radio-group>
@@ -48,16 +48,19 @@
 						<el-option
 							v-for="item in productList"
 							:key="item.id"
-							:label="item.name + ' | ' + item.specifications"
+							:label="item.name"
-							:value="item.id">
+							:value="item.id"/>
-							<span style="float: left">{{ item.name }}</span>
-							<span style="float: right; color: #8492a6; font-size: 13px">
-								{{ item.specifications }}
-							</span>
-						</el-option>
 					</el-select>
 				</el-form-item>
 			</el-col>
+			<el-col :span="6">
+				<el-form-item label="产品规格" prop="specifications">
+					<el-input
+						v-model="form.specifications"
+						placeholder="请输入产品规格"
+						disabled />
+				</el-form-item>
+			</el-col>
 			<el-col :span="6">
 				<el-form-item label="计划开始时间">
 					<el-date-picker
@@ -100,33 +103,6 @@
 						style="width: 100%"></el-input-number>
 				</el-form-item>
 			</el-col>
-			<el-col :span="6">
-				<el-form-item label="关联工艺" prop="processFlowId">
-					<el-select
-						v-model="form.processFlowId"
-						placeholder="请选择"
-						disabled
-						style="width: 100%">
-						<el-option
-							v-for="item in processFlowList"
-							:key="item.id"
-							:label="item.name"
-							:value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="6">
-				<el-form-item label="物料计算方式" prop="materialMethod">
-					<el-select
-						v-model="form.materialMethod"
-						placeholder="请选择"
-						style="width: 100%"
-						disabled>
-						<el-option label="产品基础BOM" :value="1"></el-option>
-						<el-option label="工艺扩展BOM" :value="2"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-col>
 			<el-col :span="6">
 				<el-form-item label="优先级" prop="priority">
 					<el-select
@@ -158,15 +134,14 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="6">
-				<el-form-item label="关联产线" prop="productLineId">
+				<el-form-item label="负责部门" prop="deptId">
 					<el-select
-						v-model="form.productLineId"
+						v-model="form.deptId"
-						placeholder="请选择"
+						placeholder="请选择关联产线"
-						multiple
 						style="width: 100%"
 						:disabled="isBind">
 						<el-option
-							v-for="item in productLineList"
+							v-for="item in deptList"
 							:key="item.id"
 							:label="item.name"
 							:value="item.id"></el-option>
@@ -178,37 +153,123 @@
 					<el-input v-model="form.workers" :disabled="isBind"></el-input>
 				</el-form-item>
 			</el-col>
-			<el-col :span="6">
+		</el-row>
-				<el-form-item label="负责部门" prop="deptId">
+		<el-row :gutter="20">
+			<el-col :span="24">
+				<span class="add-type">物料计算方式</span>
+				<el-radio-group
+					v-model="form.materialMethod"
+					:disabled="isBind"
+					@change="materialMethodChange">
+					<el-radio :label="1">产品基础BOM</el-radio>
+					<el-radio :label="2">工艺扩展BOM</el-radio>
+				</el-radio-group>
+			</el-col>
+		</el-row>
+		<div v-if="form.materialMethod === 1">
+			<el-row :gutter="20">
+				<el-col :span="24">
+					<span style="margin: 8px 0;" class="add-type">关联产线</span>
+					<el-button style="margin-left: 20px" type="text" @click="addBind" :disabled="isBind">
+						新增
+					</el-button>
+				</el-col>
+			</el-row>
+			<el-row
+				:gutter="20"
+				v-for="(item, index) in form.productLineIds"
+				:key="index + 'line'"
+				style="margin-bottom: 8px">
+				<el-col :span="8">
 					<el-select
-						v-model="form.deptId"
+						v-model="item.lineId"
-						placeholder="请选择关联产线"
+						placeholder="请选择产线"
+						:disabled="isBind"
 						style="width: 100%">
 						<el-option
-							v-for="item in deptList"
+							v-for="item in productLineList"
 							:key="item.id"
 							:label="item.name"
 							:value="item.id"></el-option>
 					</el-select>
-				</el-form-item>
+				</el-col>
-			</el-col>
+				<el-col :span="8">
-			<el-col :span="6">
+          <el-tooltip effect="dark" content="该产线分配生产数量" placement="top-end">
-				<el-form-item label="计划分配订单量" prop="planAssignmentQuantity">
 					<el-input-number
-						v-model="form.planAssignmentQuantity"
+						style="width: 100%"
+						v-model="item.num"
+						placeholder="请输入数量"
+						:step="1"
 						:min="0"
-						:max="9999999999999"
+						:disabled="isBind"
-						style="width: 100%"></el-input-number>
+						step-strictly />
-				</el-form-item>
+            </el-tooltip>
-			</el-col>
+				</el-col>
-		</el-row>
+			</el-row>
+		</div>
+		<div v-else>
+			<el-row :gutter="20">
+				<el-col :span="24">
+					<span style="margin: 8px 0; display: inline-block">
+						关联产线及工艺
+					</span>
+					<el-button style="margin-left: 20px" type="text" @click="addBind" :disabled="isBind">
+						新增
+					</el-button>
+				</el-col>
+			</el-row>
+			<el-row
+				:gutter="20"
+				v-for="(item, index) in form.productLineIds"
+				:key="index + 'process'"
+				style="margin-bottom: 8px">
+				<el-col :span="8">
+					<el-select
+						v-model="item.lineId"
+						placeholder="请选择产线"
+						style="width: 100%"
+						:disabled="isBind"
+						@change="processLineIdChange">
+						<el-option
+							v-for="item in productLineList"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-col>
+				<el-col :span="8">
+					<el-select
+						v-model="item.processId"
+						placeholder="请选择工艺"
+						filterable
+						:disabled="isBind"
+						style="width: 100%">
+						<el-option
+							v-for="item in processFlowList"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-col>
+				<el-col :span="8">
+          <el-tooltip effect="dark" content="该产线分配生产数量" placement="top-end">
+					<el-input-number
+						style="width: 100%"
+						v-model="item.num"
+						:step="1"
+						:min="0"
+						:disabled="isBind"
+						step-strictly />
+          </el-tooltip>
+				</el-col>
+			</el-row>
+		</div>
 	</el-form>
 </template>
 <script>
-import { getProductAll } from '@/api/base/product';
+import { getProductList } from '@/api/base/product';
 import {
-	getProcessFlowList,
+	getProcessFlowPage,
-	getWorkOrderCode,
 	orderIssue,
 	workOrderList,
 	getWorkOrderById,
@@ -216,13 +277,13 @@ import {
 import { getLineAll } from '@/api/base/productionLine';
 import { listDept } from '@/api/system/dept';
 import moment from 'moment';
+import { getCode } from '@/api/base/coreWorkOrder';
 export default {
 	name: 'AddWorkOrder',
 	data() {
 		return {
 			form: {
 				workOrderId: '',
-				orderId: '',
 				name: '',
 				code: '',
 				planProductId: '',
@@ -231,10 +292,9 @@ export default {
 				planAssignQuantity: 0,
 				deptId: undefined,
 				planQuantity: 0,
-				processFlowId: '',
 				materialMethod: 1,
 				priority: '',
-				productLineId: [],
+				productLineIds: [{ lineId: null, processId: null, num: null }],
 				type: '',
 				workers: '',
 				planAssignmentQuantity: '',
@@ -253,9 +313,6 @@ export default {
 				planQuantity: [
 					{ required: true, message: '计划生产数量不能为空', trigger: 'blur' },
 				],
-				productLineId: [
-					{ required: true, message: '产线不能为空', trigger: 'change' },
-				],
 				planAssignmentQuantity: [
 					{
 						required: true,
@@ -263,63 +320,81 @@ export default {
 						trigger: 'blur',
 					},
 				],
+				deptId:[
+					{ required: true, message: '负责部门不能为空', trigger: 'change' },
+				],
 			},
 			productList: [],
 			processFlowList: [],
 			productLineList: [],
 			workOrderTypeList: [
-				{ id: 1, name: '标准工单' },
+				{ id: 1, name: '普通' },
-				{ id: 2, name: '特殊工单' },
+				{ id: 2, name: '特殊' },
 			],
 			planStartTime: '',
 			planFinishTime: '',
-			isBind: false,
+			isBind: true,
 			workOrderList: [],
 			orderData: {},
 		};
 	},
 	methods: {
+		// 工艺变更
+		materialMethodChange(val) {
+			console.log(val);
+			this.processFlowList = [];
+			this.form.productLineIds = [];
+			const obj = { lineId: null, processId: null, num: null };
+			this.form.productLineIds.push(obj);
+		},
+		// 产线工艺关联
+		processLineIdChange(val) {
+			const params = {
+				pageNo: 1,
+				pageSize: 100,
+				lineId: val,
+			};
+			// 工艺
+			getProcessFlowPage(params).then((res) => {
+				this.processFlowList = res.data.list || [];
+				console.log(this.processFlowList);
+			});
+		},
 		init(data, param) {
 			this.isBind = true;
 			this.orderData = data;
-			this.form.orderId = data.id;
 			this.getList();
 		},
-		changeAdd() {
+		toggleWay(val) {
-			if (this.isBind) {
+			console.log(val);
-				this.isBind = false;
+			this.formClear()
-				getWorkOrderCode().then((res) => {
+			if (!val) {
-					this.form.code = res.data || '';
+				// 获取工单编码
-				});
+				getCode().then((res) => {
-				this.form.orderId = null;
+				  this.form.code = res.data;
-				this.form.planProductId = this.orderData.planProductId;
+					this.form.planProductId = this.orderData.planProductId;
-				this.form.processFlowId = this.orderData.processFlowId;
+					this.form.name = '';
-				this.form.materialMethod = this.orderData.materialMethod;
+					this.selectProduct(this.form.planProductId)
-			} else {
+				})
-				this.isBind = true;
+			}else{
-				this.form.orderId = this.orderData.id;
+				this.form.code = '';
-				this.form.planProductId = null;
+				this.form.planProductId = '';
-				this.form.processFlowId = null;
-				this.form.materialMethod = null;
-				this.form.code = null;
 			}
+			this.form.materialMethod = 1;
+			this.form.productLineIds = [];
 		},
 		getList() {
 			listDept().then((res) => {
 				this.deptList = res.data || [];
 			});
 			// 产品
-			getProductAll().then((res) => {
+			getProductList().then((res) => {
 				this.productList = res.data || [];
 			});
 			// 产线
 			getLineAll().then((res) => {
 				this.productLineList = res.data || [];
 			});
-			// 工艺
-			getProcessFlowList().then((res) => {
-				this.processFlowList = res.data || [];
-			});
 			// 工单list
 			workOrderList({
 				status: 1,
@@ -327,6 +402,18 @@ export default {
 				this.workOrderList = res.data || [];
 			});
 		},
+		// 选产品带出规格
+		selectProduct(val) {
+			if (val) {
+				this.productList.map((item) => {
+					if (val === item.id) {
+						this.form.specifications = item.specifications;
+					}
+				});
+			} else {
+				this.form.specifications = '';
+			}
+		},
 		addWorkOrderSubmit() {
 			this.$refs['addWorkOrder'].validate((valid) => {
 				if (valid) {
@@ -334,8 +421,7 @@ export default {
 						//绑定工单
 						orderIssue({
 							workOrderId: this.form.workOrderId,
-							orderId: this.form.orderId,
+							orderId: this.orderData.id,
-							planAssignmentQuantity: this.form.planAssignmentQuantity,
 						}).then((res) => {
 							if (res.code === 0) {
 								this.$modal.msgSuccess('操作成功');
@@ -344,24 +430,19 @@ export default {
 						});
 					} else {
 						// 新增工单
-						let _this = this;
+						this.form.planStartTime = this.planStartTime
-						_this.form.planStartTime = _this.planStartTime
+							? new Date(this.planStartTime).valueOf()
-							? new Date(_this.planStartTime).valueOf()
 							: '';
-						_this.form.planFinishTime = _this.planFinishTime
+						this.form.planFinishTime = this.planFinishTime
-							? new Date(_this.planFinishTime).valueOf()
+							? new Date(this.planFinishTime).valueOf()
 							: '';
-						orderIssue({ ..._this.form }).then((res) => {
+						orderIssue({
+							...this.form,
+							orderId: this.orderData.id,
+						}).then((res) => {
 							if (res.code === 0) {
-								_this.$modal.msgSuccess('操作成功');
+								this.$modal.msgSuccess('操作成功');
-								let name = this.form.name;
+								this.$emit('addWorkOrderSubmit');
-								_this.$emit('addWorkOrderSubmit');
-								// 询问是否添加预使用主原料
-								// _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
-								//     _this.$router.push({
-								//       path: '/core/core-work-order?workOrderName='+encodeURI(name)
-								//     })
-								//   })
 							}
 						});
 					}
@@ -379,39 +460,52 @@ export default {
 			this.planStartTime = '';
 			this.form.planFinishTime = '';
 			this.form.planStartTime = '';
-			this.isBind = false;
 		},
 		// 绑定工单，选择工单时获取工单信息
 		getWorkOrderMsg() {
 			if (this.form.workOrderId) {
 				getWorkOrderById({ id: this.form.workOrderId }).then((res) => {
 					if (res.code === 0) {
-						this.form.code = res.data.code;
+						this.form = res.data;
-						this.form.planProductId = res.data.planProductId;
+						this.form.workOrderId = res.data.id;
 						this.planStartTime = res.data.planStartTime
-							? moment
+							? moment(res.data.planStartTime)
-									.unix(res.data.planStartTime)
 									.format('YYYY-MM-DD HH:mm:ss')
 							: null;
 						this.planFinishTime = res.data.planFinishTime
-							? moment
+							? moment(res.data.planFinishTime)
-									.unix(res.data.planFinishTime)
 									.format('YYYY-MM-DD HH:mm:ss')
 							: null;
-						this.form.planAssignQuantity = res.data.planAssignQuantity;
-						this.form.planQuantity = res.data.planQuantity;
-						this.form.processFlowId = res.data.processFlowId;
-						this.form.materialMethod = res.data.materialMethod;
 						this.form.priority = res.data.priority
 							? res.data.priority + ''
 							: '';
-						this.form.productLineId = res.data.productLineIds;
+						// 根据产线获取工艺
-						this.form.type = res.data.type;
+						if (this.form.materialMethod === 2) {
-						this.form.workers = res.data.workers;
+							this.form.productLineIds.forEach((item) => {
+								if (item.lineId) {
+									this.processLineIdChange(item.lineId);
+								}
+							})
+						}
 					}
 				});
 			}
 		},
+		addBind() {
+			const obj = { lineId: null, processId: null, num: null };
+			this.form.productLineIds.push(obj);
+		},
 	},
 };
 </script>
+<style scoped>
+.add-type {
+	margin: 0 20px 15px 0;
+	display: inline-block;
+}
+.add-type::before {
+	content: '*';
+	color: #ff4949;
+	margin-right: 4px;
+}
+</style>

src/views/produce/order/base/orderManage/components/orderAdd.vue

@@ -19,6 +19,12 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="产品名称" prop="planProductId">
+          <el-select @change="getSpec" v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable>
+            <el-option v-for="item in productList" :key="item.id" :label="item.name"
+              :value="item.id"/>
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="产品名称" prop="planProductId">
           <el-select @change="getSpec" v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option v-for="item in productList" :key="item.id" :label="item.name+' | '+(item.specifications || '')"
               :value="item.id">
@@ -26,7 +32,7 @@
               <span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </el-col>
     </el-row>
     <el-row :gutter="20">
@@ -79,7 +85,7 @@
 </template>
 <script>
 import { getOrderCode, getOrderById, getProcessFlowList, orderUpdate, orderCreate } from '@/api/base/orderManage'
-import { getProductAll } from '@/api/base/product'
+import { getProductList } from '@/api/base/product'
 import { getCustomerList } from '@/api/base/customer'
 export default {
   name: 'OrderAdd',
@@ -160,7 +166,7 @@ export default {
     },
     getList() {
       // 产品
-      getProductAll().then(res => {
+      getProductList().then(res => {
         this.productList = res.data || []
       })
       // 客户

src/views/produce/order/base/orderManage/components/orderSplit.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-09-26 14:08:58
  * @LastEditors: zwq
- * @LastEditTime: 2024-11-06 09:52:59
+ * @LastEditTime: 2024-11-13 15:23:25
  * @Description:
 -->
 <template>
@@ -69,7 +69,7 @@ const tableProps = [
 		showOverflowtooltip: true,
 	},
 	{
-		prop: 'specifications',
+		prop: 'productSpec',
 		label: '产品规格',
 		showOverflowtooltip: true,
 	},
@@ -92,7 +92,7 @@ const tableProps = [
 		subcomponent: selectTime,
 	},
 	{
-		prop: 'customerId',
+		prop: 'customerName',
 		label: '客户',
 		showOverflowtooltip: true,
 		// subcomponent: selectMember,

src/views/produce/order/base/orderManage/index.vue

@@ -69,7 +69,7 @@
 			</el-table-column>
 			<el-table-column prop="workOrderNum" label="工单数量" width="140">
 				<template v-slot="scope">
-					<el-button @click="handleRoute" type="text">
+					<el-button @click="handleRoute(scope.row)" type="text">
 						{{ scope.row.workOrderNum }}
 					</el-button>
 				</template>
@@ -117,14 +117,14 @@
 					<el-button
 						type="text"
 						:disabled="
-							!(scope.row.status === 1 && scope.row.triggerOrigin === 1)
+							!(scope.row.status === 1)
 						"
 						@click="handleClick({ data: scope.row, type: 'edit' })"
 						v-hasPermi="['base:order-manage:edit']">
 						<span
 							class="iconfont icon-edit"
 							:class="
-								!(scope.row.status === 1 && scope.row.triggerOrigin === 1)
+								!(scope.row.status === 1)
 									? ''
 									: 'primary-color'
 							" />
@@ -193,7 +193,6 @@
 import { parseTime } from '@/utils/ruoyi';
 import {
 	getOrderPage,
-	orderDelete,
 	orderAssignmentList,
 	orderFinish,
 	orderVoid,
@@ -380,7 +379,6 @@ export default {
 			}
 		},
 		handleClick(val) {
-			console.log(val);
 			switch (val.type) {
 				case 'edit':
 					this.addOrEditTitle = '编辑';
@@ -389,21 +387,11 @@ export default {
 						this.$refs.orderAdd.init(val.data.id);
 					});
 					break;
-				case 'delete':
-					this.handleDelete(val.data);
-					break;
 				case 'detail':
 					this.$router.push({
 						path: 'order-detail-data?orderId=' + val.data.id,
 					});
 					break;
-				case 'add':
-					this.workIssueTitle = '新增工单';
-					this.addWorkOrdervisible = true;
-					this.$nextTick(() => {
-						this.$refs.addWorkOrder.init(val.data, 'add');
-					});
-					break;
 				case 'void':
 					orderVoid({ id: val.data.id }).then((res) => {
 						console.log(res);
@@ -437,19 +425,6 @@ export default {
 				default:
 			}
 		},
-		// 删除
-		handleDelete(val) {
-			this.$modal
-				.confirm('是否确认删除"' + val.name + '"的数据项?')
-				.then(function () {
-					return orderDelete({ id: val.id });
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('操作成功');
-				})
-				.catch(() => {});
-		},
 		// 完成
 		handleComplete(val) {
 			this.$modal
@@ -499,13 +474,13 @@ export default {
 			this.splitWorkOrderCancel();
 			this.getList();
 		},
-		async handleRoute() {
+		async handleRoute(row) {
 			const res = await orderAssignmentList({
-				orderIdList: [this.injectData.id],
+				orderIdList: [row.id],
 			});
 			console.log(res.data);
 			let arr = [];
-			res.data[this.injectData.id].forEach((ele) => {
+			res.data[row.id].forEach((ele) => {
 				arr.push(ele.workOrderId);
 			});
 			let woIdString = arr.join(',');

src/views/produce/order/base/orderManage/orderDetailData.vue

@@ -9,7 +9,7 @@
 				type="primary"
 				plain
 				size="small"
-				style="float: right; margin-top: -10px"
+				style="float: right; margin-top: -25px"
 				@click="returnOrderManage">
 				<svg-icon icon-class="return" />
 				返回
@@ -421,6 +421,19 @@ export default {
 	.box1 {
 		height: 215px;
 		padding: 16px 16px 0 16px;
+		.boxTitle {
+			font-size: 16px;
+			font-weight: 600;
+		}
+		.blueTitle {
+			display: inline-block;
+			width: 4px;
+			height: 18px;
+			background-color: #0b58ff;
+			margin-right: 8px;
+			position: relative;
+			top:4px;
+		}
 		.blodTip {
 			height: 16px;
 			font-size: 14px;

src/views/produce/order/monitoring/components/monitoringRingCharts.vue

@@ -81,7 +81,7 @@ export default {
         this.chartList[i].workOrder.map(item => {
           colorList.push(item.color)
         })
-        let percentage = (this.chartList[i].sunNum/this.chartList[i].num*100).toFixed(0)
+        let percentage = (this.chartList[i].sunNum/this.chartList[i].num*100).toFixed(2)
         var option = {
           color: colorList,
           series: [

src/views/produce/order/monitoring/orderCompletionMonitoring/index.vue

@@ -249,14 +249,14 @@ export default {
               let sunNum = 0
               for (let i = 0; i < tempArr[key].length; i++) {
                 let subObj = {}
-                subObj.value = tempArr[key][i].actualAssignmentQuantity
+                subObj.value = tempArr[key][i].actualAssignmentQuantity || 0
                 subObj.name = tempArr[key][i].woName
                 if (i < 5) {
                   subObj.color = color[i]
                 } else {
                   subObj.color = color[i%5]
                 }
-                sunNum+=tempArr[key][i].actualAssignmentQuantity
+                sunNum+=(tempArr[key][i].actualAssignmentQuantity || 0)
                 tempArr3.push(subObj)
               }
               tempArr3.push({
@@ -268,6 +268,7 @@ export default {
               obj.workOrder = tempArr3
               tempArr2.push(obj)
             }
+            console.log(tempArr2)
             this.chartList = tempArr2
             if (this.activeName === 'barChart' && this.chartList.length > 0) {
               this.$nextTick(() => {

src/views/produce/workOrder/SmallTitle.vue

@@ -40,7 +40,7 @@ $pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
 $mgr: 8px;
 @each $size, $height in $pxls {
 	.#{$size}-title {
-		font-size: 18px;
+		font-size: $height;
 		line-height: $height;
 		color: #000;
 		font-weight: 500;

src/views/produce/workOrder/addWorkOrder.vue

@@ -43,7 +43,8 @@
 				<el-form-item label="产品规格" prop="specifications">
 					<el-input
 						v-model="dataForm.specifications"
-						placeholder="请输入产品规格" />
+						placeholder="请输入产品规格"
+						disabled/>
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
@@ -149,11 +150,6 @@
 					<el-radio :label="1">产品基础BOM</el-radio>
 					<el-radio :label="2">工艺扩展BOM</el-radio>
 				</el-radio-group>
-				<!-- <el-select v-model="dataForm.materialMethod" placeholder="请选择物料计算方式" style="width: 100%;"
-            @change="materialMethodChange">
-            <el-option key="1" label="产品基础BOM" :value="1" />
-            <el-option key="2" label="工艺扩展BOM" :value="2" />
-          </el-select> -->
 			</el-col>
 		</el-row>
 		<div v-if="dataForm.materialMethod === 1">
@@ -183,6 +179,7 @@
 					</el-select>
 				</el-col>
 				<el-col :span="8">
+          <el-tooltip effect="dark" content="该产线分配生产数量" placement="top-end">
 					<el-input-number
 						style="width: 100%"
 						v-model="item.num"
@@ -190,6 +187,7 @@
 						:step="1"
 						:min="0"
 						step-strictly />
+            </el-tooltip>
 				</el-col>
 			</el-row>
 		</div>
@@ -236,26 +234,21 @@
 					</el-select>
 				</el-col>
 				<el-col :span="8">
+          <el-tooltip effect="dark" content="该产线分配生产数量" placement="top-end">
 					<el-input-number
 						style="width: 100%"
 						v-model="item.num"
 						:step="1"
 						:min="0"
 						step-strictly />
+          </el-tooltip>
 				</el-col>
 			</el-row>
 		</div>
-		<!-- <el-row>
-      <el-col :span='12'>
-        <el-form-item label="计划分配订单量" prop="planAssignmentQuantity">
-          <el-input-number v-model="form.planAssignmentQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
-        </el-form-item>
-      </el-col>
-    </el-row> -->
 	</el-form>
 </template>
 <script>
-import { getProductAll } from '@/api/base/product';
+import { getProductList } from '@/api/base/product';
 import { getProcessFlowPage, workOrderList } from '@/api/base/orderManage';
 import {
 	createCoreWO,
@@ -323,9 +316,6 @@ export default {
 				{ id: 1, name: '普通' },
 				{ id: 2, name: '特殊' },
 			],
-			planStartTime: '',
-			planFinishTime: '',
-			isBind: false,
 			workOrderList: [],
 		};
 	},
@@ -340,10 +330,6 @@ export default {
 			this.dataForm.productLineIds = [];
 			const obj = { lineId: null, processId: null, num: null };
 			this.dataForm.productLineIds.push(obj);
-			// if (val === 2 && !this.dataForm.processFlowId) {
-			// 	this.dataForm.materialMethod = 1;
-			// 	this.$modal.msgError('请先选择关联工艺');
-			// }
 		},
 		// 产线工艺关联
 		processLineIdChange(val) {
@@ -355,6 +341,7 @@ export default {
 			// 工艺
 			getProcessFlowPage(params).then((res) => {
 				this.processFlowList = res.data.list || [];
+				console.log(this.processFlowList);
 			});
 		},
 		init(id) {
@@ -365,15 +352,26 @@ export default {
 			}
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
-				this.planStartTime = '';
+				this.dataForm.planStartTime = '';
-				this.planFinishTime = '';
+				this.dataForm.planFinishTime = '';
+				this.dataForm.productLineIds = [{ lineId: null, processId: null, num: null }];
 				if (this.dataForm.id) {
 					getCoreWO(id).then((response) => {
 						this.dataForm = response.data;
+						this.dataForm.planStartTime = response.data.planStartTime ? response.data.planStartTime : '';
+						this.dataForm.planFinishTime = response.data.planFinishTime ? response.data.planFinishTime : '';
 						if (this.dataForm.priority !== undefined) {
 							this.dataForm.priority = String(this.dataForm.priority);
 						}
 						this.dataForm.priority;
+						// 根据产线获取工艺
+						if (this.dataForm.materialMethod === 2) {
+							this.dataForm.productLineIds.forEach((item) => {
+								if (item.lineId) {
+									this.processLineIdChange(item.lineId);
+								}
+							})
+						}
 					});
 				} else {
 					if (this.urlOptions.isGetCode) {
@@ -418,21 +416,7 @@ export default {
 					this.urlOptions.createURL(this.dataForm).then((response) => {
 						this.$modal.msgSuccess('新增成功');
 						this.visible = false;
-						this.$confirm('是否添加预使用主原料信息?', '提示', {
+						this.$emit('refreshDataList');
-							confirmButtonText: '确定',
-							cancelButtonText: '取消',
-							type: 'warning',
-						})
-							.then(() => {
-								console.log('121', this.dataForm.name);
-								this.$emit('refreshDataList', {
-									id: response.data,
-									name: this.dataForm.name,
-								});
-							})
-							.catch(() => {
-								this.$emit('refreshDataList');
-							});
 					});
 				}
 			});
@@ -447,7 +431,7 @@ export default {
 		},
 		getDict() {
 			// 产品
-			getProductAll().then((res) => {
+			getProductList().then((res) => {
 				this.productList = res.data || [];
 			});
 			// 产线

src/views/produce/workOrder/allocation copy.vue

@@ -0,0 +1,311 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: DY
+ * @LastEditTime: 2024-07-19 18:59:13
+ * @Description:
+-->
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		size="55%">
+		<small-title slot="title" :no-padding="true">
+			{{ '分配产量' }}
+		</small-title>
+		<div class="content">
+			<div class='formContainer'>
+				<el-row :gutter="20">
+					<el-col :span="12"><span class='label'>工单名称：</span><span class='text'>{{ dataForm.name }}</span></el-col>
+					<el-col :span="12"><span class='label'>工单编码：</span><span class='text'>{{ dataForm.code }}</span></el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="12"><span class='label'>产品名称：</span><span class='text'>{{ dataForm.productName }}</span></el-col>
+					<el-col :span="12"><span class='label'>产品规格：</span><span class='text'>{{ dataForm.specifications }}</span></el-col>
+				</el-row>
+				<el-row :gutter="20">
+					<el-col :span="12"><span class='label'>实际生产数量：</span><span class='text'>{{ dataForm.actualQuantity }}</span></el-col>
+				</el-row>
+			</div>
+
+			<div class="attr-list">
+				<!-- <el-button v-show="!isdetail" type="success" size="small" style="float: right" @click="addRow()">添加一行</el-button> -->
+				<el-table
+					border
+					:data="tableData"
+					:header-cell-style="{
+						background: '#F2F4F9',
+						color: '#606266'
+					}"
+      		style="width: 100%">
+					<el-table-column type="index" label="序号" width='50' align="center" />
+					<el-table-column prop="orderName" label="订单名称" />
+					<el-table-column prop="orderCode" label="订单编码" />
+					<el-table-column prop="priority" label="优先级" />
+					<el-table-column prop="planAssignmentQuantity" label="计划分配数量" >
+						<template slot-scope="scope">
+							<el-input v-model="scope.row.planAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
+						</template>
+					</el-table-column>
+					<el-table-column prop="actualAssignmentQuantity" label="实际分配数量">
+						<template slot-scope="scope">
+							<el-input v-model="scope.row.actualAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" width='50' align="center" fixed='right'>
+						<template slot-scope="scope">
+							<el-button type="text" size="small" @click="saveData(scope.row)">保存</el-button>
+							<!-- <el-tooltip v-if="!scope.row.isEdit" placement="top" content="编辑">
+								<el-button
+									type="text"
+									:style="{color:'#0B58FF'}"
+									size="mini"
+									@click="edit(scope.row)"
+								>
+									<svg-icon style="width: 18px; height: 18px" class="item-icon" icon-class="edit" />
+								</el-button>
+							</el-tooltip> -->
+							
+							<!-- <el-tooltip placement="top" content="删除">
+								<el-button
+									type="text"
+									:style="{color:'#FF5454'}"
+									size="mini"
+									@click="deleteDetail(scope.row)"
+								>
+									<svg-icon style="width: 18px; height: 18px" class="item-icon" icon-class="table_delete" />
+								</el-button>
+							</el-tooltip> -->
+						</template>
+					</el-table-column>
+				</el-table>
+				<pagination
+					v-show="listQuery.total > 0"
+					:total="listQuery.total"
+					:page.sync="listQuery.pageNo"
+					:limit.sync="listQuery.pageSize"
+					:page-sizes="[5, 10, 15]"
+					@pagination="getList" />
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" type="primary" @click="goback()">关闭</el-button>
+				<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
+					编辑
+				</el-button>
+				<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button> -->
+			</div>
+		</div>
+
+		<!-- <attr-add
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			:material-id="dataForm.id"
+			@refreshDataList="getList" /> -->
+	</el-drawer>
+</template>
+
+<script>
+import basicAdd from '../../core/mixins/basic-add';
+import { getConOrderList, createConCoreWOr, getCoreWO } from '@/api/base/coreWorkOrder';
+import SmallTitle from './SmallTitle';
+// import { parseTime } from '../../core/mixins/code-filter';
+// import attrAdd from './attr-add';
+
+export default {
+	mixins: [basicAdd],
+	components: { SmallTitle },
+	data() {
+		return {
+			addOrUpdateVisible: false,
+			urlOptions: {
+				infoURL: getCoreWO,
+			},
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				total: 0,
+			},
+			dataForm: {
+        id: undefined,
+        code: undefined,
+        productId: '',
+        remark: undefined,
+			},
+			productList: [],
+			materialAttrList: [],
+			materialList: [],
+			tableData: [],
+			visible: false,
+			isdetail: false,
+			idAttrShow: false
+		};
+	},
+	mounted() {},
+	methods: {
+		initData() {
+			// this.materialAttrList.splice(0);
+			this.listQuery.total = 0;
+		},
+		edit(row) {
+			row.isEdit = true
+		},
+		saveData(row) {
+			if (row.actualAssignmentQuantity) {
+				if (row.id) {
+					// updateMaterialPBDet({
+					// 	...row
+					// }).then((response) => {
+					// 	this.$modal.msgSuccess('修改成功');
+					// 	// this.visible = false;
+					// 	this.getList();
+					// });
+					// return;
+				}
+					// 添加的提交
+				createConCoreWOr({
+					...row,
+					workOrderId: this.dataForm.id
+				}).then((response) => {
+					this.$modal.msgSuccess('分配成功');
+					// this.visible = false;
+					this.getList();
+				});
+			} else {
+				this.$message.warning('请填写实际分配数量');
+			}
+		},
+		getList() {
+			// 获取产品Bom详细列表
+			getConOrderList({
+				...this.listQuery,
+				workOrderId: this.dataForm.id
+			}).then((response) => {
+				this.tableData = response.data.map(item => {
+					item.isEdit = false
+					return item
+				});
+				this.listQuery.total = response.data.total;
+			});
+		},
+		// 构造一行
+		// addRow() {
+		// 	const row = {
+		// 		bomId: this.dataForm.id,
+		// 		materialId: '',
+		// 		num: 0,
+		// 		materialCode: undefined,
+		// 		unit: undefined,
+		// 		remark: '',
+		// 		isEdit: true
+		// 	}
+		// 	this.tableData.push(row)
+		// },
+		init(id, isdetail) {
+			this.initData();
+			this.isdetail = isdetail || false;
+			this.dataForm.id = id || undefined;
+			this.visible = true;
+			// if (id) {
+			// 	this.idAttrShow = true
+			// } else {
+			// 	this.idAttrShow = false
+			// }
+
+			this.$nextTick(() => {
+				// this.$refs['dataForm'].resetFields();
+
+				if (this.dataForm.id) {
+					// 获取工单详情
+					this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data;
+          });
+					// 获取工单订单明细
+					this.getList();
+				} else {}
+			});
+		},
+		goback() {
+			this.$emit('refreshDataList');
+			this.visible = false;
+			// this.initData();
+		},
+		goEdit() {
+			this.isdetail = false;
+		},
+		// 新增 / 修改
+		addNew(id) {
+			this.addOrUpdateVisible = true;
+			this.$nextTick(() => {
+				this.$refs.addOrUpdate.init(id);
+			});
+		}
+	}
+};
+</script>
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .el-form-item__label {
+	padding: 0;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+}
+.drawer >>> .el-drawer__body {
+	flex: 1;
+	height: 1px;
+	display: flex;
+	flex-direction: column;
+}
+
+.drawer >>> .content {
+	padding: 30px 24px;
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	/* height: 100%; */
+}
+
+.drawer >>> .visual-part {
+	flex: 1 auto;
+	max-height: 30vh;
+	overflow: hidden;
+	overflow-y: scroll;
+	padding-right: 10px; /* 调整滚动条样式 */
+}
+
+.drawer >>> .el-form {
+	padding: 0 16px;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+.formContainer {
+  .label {
+		display: inline-block;
+		padding: 5px 0px;
+		font-size: 14px;
+		font-weight: 600;
+	}
+	.text {
+		display: inline-block;
+		padding: 5px 0px;
+		font-size: 14px;
+		color:rgba(102, 102, 102, 0.75);
+	}
+	margin-bottom: 10px;
+}
+</style>

src/views/produce/workOrder/allocation.vue

@@ -16,98 +16,58 @@
 			{{ '分配产量' }}
 		</small-title>
 		<div class="content">
-			<div class="formContent">
+			<div class='formContainer'>
 				<el-row :gutter="20">
-					<el-col :span="12">工单名称:{{ dataForm.name }}</el-col>
+					<el-col :span="12"><span class='label'>工单名称：</span><span class='text'>{{ dataForm.name }}</span></el-col>
-					<el-col :span="12">工单编码:{{ dataForm.code }}</el-col>
+					<el-col :span="12"><span class='label'>工单编码：</span><span class='text'>{{ dataForm.code }}</span></el-col>
 				</el-row>
 				<el-row :gutter="20">
-					<el-col :span="12">产品名称:{{ dataForm.productName }}</el-col>
+					<el-col :span="12"><span class='label'>产品名称：</span><span class='text'>{{ dataForm.productName }}</span></el-col>
-					<el-col :span="12">产品规格:{{ dataForm.specifications }}</el-col>
+					<el-col :span="12"><span class='label'>产品规格：</span><span class='text'>{{ dataForm.specifications }}</span></el-col>
 				</el-row>
 				<el-row :gutter="20">
-					<el-col :span="12">实际生产数量:{{ dataForm.expectedTime }}</el-col>
+					<el-col :span="12"><span class='label'>实际生产数量：</span><span class='text'>{{ dataForm.actualQuantity }}</span></el-col>
 				</el-row>
 			</div>
 
 			<div class="attr-list">
-				<!-- <el-button v-show="!isdetail" type="success" size="small" style="float: right" @click="addRow()">添加一行</el-button> -->
 				<el-table
+					border
 					:data="tableData"
+					:header-cell-style="{
+						background: '#F2F4F9',
+						color: '#606266'
+					}"
       		style="width: 100%">
-					<el-table-column type="index" label="序号" />
+					<el-table-column type="index" label="序号" width='50' align="center" />
 					<el-table-column prop="orderName" label="订单名称" />
 					<el-table-column prop="orderCode" label="订单编码" />
-					<el-table-column prop="priority" label="优先级" />
+					<el-table-column prop="priority" label="优先级">
-					<el-table-column prop="planAssignmentQuantity" label="计划分配数量" >
 						<template slot-scope="scope">
-							<el-input v-model="scope.row.planAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
+							{{scope.row.priority == 1 ? '低' : scope.row.priority == 2 ? '正常' : scope.row.priority == 3 ? '高' : ''}}
 						</template>
 					</el-table-column>
+					<el-table-column prop="planAssignmentQuantity" label="计划分配数量" />
 					<el-table-column prop="actualAssignmentQuantity" label="实际分配数量">
 						<template slot-scope="scope">
-							<el-input v-model="scope.row.actualAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
+							<el-input-number :disabled='isSaved' v-model="scope.row.actualAssignmentQuantity" style='width: 100%;' controls-position="right" :min="0" :max="dataForm.actualQuantity"></el-input-number>
-						</template>
-					</el-table-column>
-					<el-table-column label="操作">
-						<template slot-scope="scope">
-							<el-button type="text" size="small" @click="saveData(scope.row)">保存</el-button>
-							<!-- <el-tooltip v-if="!scope.row.isEdit" placement="top" content="编辑">
-								<el-button
-									type="text"
-									:style="{color:'#0B58FF'}"
-									size="mini"
-									@click="edit(scope.row)"
-								>
-									<svg-icon style="width: 18px; height: 18px" class="item-icon" icon-class="edit" />
-								</el-button>
-							</el-tooltip> -->
-							
-							<!-- <el-tooltip placement="top" content="删除">
-								<el-button
-									type="text"
-									:style="{color:'#FF5454'}"
-									size="mini"
-									@click="deleteDetail(scope.row)"
-								>
-									<svg-icon style="width: 18px; height: 18px" class="item-icon" icon-class="table_delete" />
-								</el-button>
-							</el-tooltip> -->
 						</template>
 					</el-table-column>
 				</el-table>
-				<pagination
-					v-show="listQuery.total > 0"
-					:total="listQuery.total"
-					:page.sync="listQuery.pageNo"
-					:limit.sync="listQuery.pageSize"
-					:page-sizes="[5, 10, 15]"
-					@pagination="getList" />
 			</div>
 
 			<div class="drawer-body__footer">
-				<el-button style="" type="primary" @click="goback()">关闭</el-button>
+				<el-button plain type="primary" @click="goback()">关闭</el-button>
-				<!-- <el-button v-if="isdetail" type="primary" @click="goEdit()">
+				<el-button type="primary" @click="saveData()" :disabled='isSaved'>保存</el-button>
-					编辑
-				</el-button>
-				<el-button v-else type="primary" @click="dataFormSubmit()">确定</el-button> -->
 			</div>
 		</div>
-
-		<!-- <attr-add
-			v-if="addOrUpdateVisible"
-			ref="addOrUpdate"
-			:material-id="dataForm.id"
-			@refreshDataList="getList" /> -->
 	</el-drawer>
 </template>
 
 <script>
 import basicAdd from '../../core/mixins/basic-add';
-import { getConOrderList, createConCoreWOr, getCoreWO } from '@/api/base/coreWorkOrder';
+import { getConOrderList, updateBatch, getCoreWO } from '@/api/base/coreWorkOrder';
 import SmallTitle from './SmallTitle';
-// import { parseTime } from '../../core/mixins/code-filter';
-// import attrAdd from './attr-add';
 
 export default {
 	mixins: [basicAdd],
@@ -118,100 +78,51 @@ export default {
 			urlOptions: {
 				infoURL: getCoreWO,
 			},
-			listQuery: {
-				pageSize: 10,
-				pageNo: 1,
-				total: 0,
-			},
 			dataForm: {
         id: undefined,
         code: undefined,
         productId: '',
         remark: undefined,
 			},
-			productList: [],
-			materialAttrList: [],
-			materialList: [],
 			tableData: [],
 			visible: false,
-			isdetail: false,
+			isSaved:false
-			idAttrShow: false
 		};
 	},
 	mounted() {},
 	methods: {
-		initData() {
+		saveData() {
-			// this.materialAttrList.splice(0);
+			console.log(this.tableData)
-			this.listQuery.total = 0;
+			let sunNum = 0
-		},
+			this.tableData.forEach(row => {
-		edit(row) {
+			  sunNum+=(row.actualAssignmentQuantity || 0)
-			row.isEdit = true
+			})
-		},
+			if (sunNum > this.dataForm.actualQuantity) {
-		saveData(row) {
+				this.$message.warning('各订单实际分配数量之和不能大于实际生产数量');
-			if (row.actualAssignmentQuantity) {
+				return
-				if (row.id) {
-					// updateMaterialPBDet({
-					// 	...row
-					// }).then((response) => {
-					// 	this.$modal.msgSuccess('修改成功');
-					// 	// this.visible = false;
-					// 	this.getList();
-					// });
-					// return;
-				}
-					// 添加的提交
-				createConCoreWOr({
-					...row,
-					workOrderId: this.dataForm.id
-				}).then((response) => {
-					this.$modal.msgSuccess('分配成功');
-					// this.visible = false;
-					this.getList();
-				});
-			} else {
-				this.$message.warning('请填写实际分配数量');
 			}
+			updateBatch(this.tableData).then((response) => {
+				this.$modal.msgSuccess('分配成功');
+				this.isSaved = true;
+			});
 		},
 		getList() {
 			// 获取产品Bom详细列表
 			getConOrderList({
-				...this.listQuery,
 				workOrderId: this.dataForm.id
 			}).then((response) => {
 				this.tableData = response.data.map(item => {
-					item.isEdit = false
+					item.actualAssignmentQuantity = item.actualAssignmentQuantity || 0
+					item.workOrderId = this.dataForm.id
 					return item
 				});
-				this.listQuery.total = response.data.total;
 			});
 		},
-		// 构造一行
+		init(id) {
-		// addRow() {
-		// 	const row = {
-		// 		bomId: this.dataForm.id,
-		// 		materialId: '',
-		// 		num: 0,
-		// 		materialCode: undefined,
-		// 		unit: undefined,
-		// 		remark: '',
-		// 		isEdit: true
-		// 	}
-		// 	this.tableData.push(row)
-		// },
-		init(id, isdetail) {
-			this.initData();
-			this.isdetail = isdetail || false;
 			this.dataForm.id = id || undefined;
 			this.visible = true;
-			// if (id) {
+			this.isSaved = false;
-			// 	this.idAttrShow = true
-			// } else {
-			// 	this.idAttrShow = false
-			// }
-
 			this.$nextTick(() => {
-				// this.$refs['dataForm'].resetFields();
-
 				if (this.dataForm.id) {
 					// 获取工单详情
 					this.urlOptions.infoURL(id).then(response => {
@@ -225,17 +136,6 @@ export default {
 		goback() {
 			this.$emit('refreshDataList');
 			this.visible = false;
-			// this.initData();
-		},
-		goEdit() {
-			this.isdetail = false;
-		},
-		// 新增 / 修改
-		addNew(id) {
-			this.addOrUpdateVisible = true;
-			this.$nextTick(() => {
-				this.$refs.addOrUpdate.init(id);
-			});
 		}
 	}
 };
@@ -279,8 +179,7 @@ export default {
 	padding-right: 10px; /* 调整滚动条样式 */
 }
 
-.drawer >>> .el-form,
+.drawer >>> .el-form {
-.drawer >>> .attr-list {
 	padding: 0 16px;
 }
 
@@ -289,10 +188,19 @@ export default {
 	justify-content: flex-end;
 	padding: 18px;
 }
-.formContent {
+.formContainer {
-	font-size: 16px;
+  .label {
-	line-height: 1.5;
+		display: inline-block;
+		padding: 5px 0px;
+		font-size: 14px;
+		font-weight: 600;
+	}
+	.text {
+		display: inline-block;
+		padding: 5px 0px;
+		font-size: 14px;
+		color:rgba(102, 102, 102, 0.75);
+	}
 	margin-bottom: 10px;
-	width: 100%;
 }
 </style>

src/views/produce/workOrder/index.vue

@@ -130,17 +130,7 @@ export default {
 								{
 									name: 'status',
 									type: 'equal',
-									value: 2
+									value: 1
-								},
-								{
-									name: 'status',
-									type: 'equal',
-									value: 3
-								},
-								{
-									name: 'status',
-									type: 'equal',
-									value: 4
 								}
 							]
 						}
@@ -315,7 +305,14 @@ export default {
         {
           prop: 'status',
           label: '工单状态',
-          filter: (val) => ['', '等待', '激活', '暂停', '完成', '', '', '', '', '作废'][val]
+          filter: (val) => ['', '等待', '激活', '暂停', '完成', '作废', '终止', '', '', ''][val]
+        },
+        {
+          prop: 'startProduceTime',
+          label: '实际开始时间',
+          filter: parseTime,
+          minWidth: 150,
+          showOverflowtooltip: true
         },
         {
           prop: 'planFinishTime',
@@ -362,20 +359,20 @@ export default {
 			})
 		},
 		refreshWorkOrder(val) {
-			console.log(val)
+			// if (val) {
-			if (val) {
+			// 	// 预使用原料信息
-				// 预使用原料信息
+			// 	console.log('预使用原料信息')
-				console.log('预使用原料信息')
+			// 	this.handleCancel()
-				this.handleCancel()
+      // 	this.getDataList()
-      	this.getDataList()
+			// 	this.materialVisible = true;
-				this.materialVisible = true;
+      //   this.addOrEditTitle = "预使用主原料信息";
-        this.addOrEditTitle = "预使用主原料信息";
+      //   this.$nextTick(() => {
-        this.$nextTick(() => {
+      //     this.$refs.material.init(val, true);
-          this.$refs.material.init(val, true);
+      //   });
-        });
+			// } else {
-			} else {
+			// 	this.successSubmit()
-				this.successSubmit()
+			// }
-			}
+      this.successSubmit()
 		},
 		closeDetail() {
 			this.detailVisible = false
@@ -417,7 +414,7 @@ export default {
 					opration = '暂停'
 				}
 				if (val.type === 'nullify') {
-					param.status = 9
+					param.status = 5
 					opration = '报废'
 				}
 				if (val.type === 'finish') {
@@ -475,7 +472,6 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
 					this.listQuery.name = val.name ? val.name : undefined;
 					this.listQuery.status = val.status ? val.status : undefined;
 					this.listQuery.startProduceTime = val.time ? val.time : undefined
@@ -484,7 +480,6 @@ export default {
 				case 'reset':
 					this.$refs.searchBarForm.resetForm();
 					this.listQuery = {
-						pageSize: 10,
 						pageNo: 1,
 						total: 1,
 					};

src/views/produce/workOrder/workOrderNav.vue

@@ -1,23 +1,20 @@
 <!--
  * @Author: zhp
  * @Date: 2024-09-09 15:39:08
- * @LastEditTime: 2024-09-11 10:25:54
+ * @LastEditTime: 2024-11-18 16:43:54
- * @LastEditors: zhp
+ * @LastEditors: zwq
  * @Description:
 -->
 <template>
   <div>
     <div class="button-nav">
       <!-- <div class="text-carousel"> -->
-      <el-button style="flex: .1" type="text" @click="prevText" icon="el-icon-caret-left"></el-button>
+      <el-button class='btn' style="flex: .1" type="text" @click="prevText" icon="el-icon-caret-left"></el-button>
-      <button @click="handleChange(item.id)" v-for="(item,index) in idList" :key="item.id"
+      <button class='tap-btn' @click="handleChange(item.id)" v-for="(item,index) in idList" :key="item.id"
         :class="[item.id === currentMenu ? 'active' : '']">{{ item.name }}
       </button>
-      <el-button style="flex: .1" type="text" @click="nextText" icon="el-icon-caret-right"></el-button>
+      <el-button class='btn' style="flex: .1" type="text" @click="nextText" icon="el-icon-caret-right"></el-button>
-      <button style="flex: .2;display: inline-block;" @click="goback()">
+      <el-button type="primary" plain style="flex: .2;margin-left: 0px;" @click="goback()"><svg-icon icon-class="return" />返回</el-button>
-        <svg-icon style="width: 20px; height: 20px" :icon-class=" 'back' " />
-        <span>返回</span>
-      </button>
     </div>
     <!-- </div> -->
   </div>
@@ -84,16 +81,19 @@ export default {
 <style scoped lang="scss">
 .button-nav {
   width: 100%;
-  padding: 12px 0;
+  padding-bottom:5px;
   display: flex;
-  // justify-content: space-around;
   gap: 12px;
 
   * {
     user-select: none;
   }
+  .btn {
+    background: #fff;
+  }
 
-  button {
+  .tap-btn {
+    font-size: 16px;
     cursor: pointer;
     appearance: none;
     outline: none;
@@ -102,7 +102,7 @@ export default {
     border-radius: 8px;
     border-bottom-left-radius: 5px;
     border-bottom-right-radius: 5px;
-    padding: 20px;
+    height: 40px;
     color: #888;
     letter-spacing: 2px;
     flex: 1;

src/views/warehouse/warehouse-base/warehouse-area-setup/index.vue

@@ -1,15 +1,14 @@
 <template>
 	<div class="app-container">
-
+		<!-- 搜索工作栏 -->
-<!-- 搜索工作栏 -->
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 
-    <!-- 列表 -->
+		<!-- 列表 -->
 		<base-table
-      v-loading="dataListLoading"
+			v-loading="dataListLoading"
 			:table-props="tableProps"
 			:page="listQuery.pageNo"
 			:limit="listQuery.pageSize"
@@ -49,13 +48,11 @@ import AddOrUpdate from './add-or-updata';
 import basicPage from '@/mixins/basic-page';
 import codeFilter from '@/mixins/code-filter';
 import {
-  deleteWarehouseArea,
+	deleteWarehouseArea,
-  getWarehouseAreaPage,
+	getWarehouseAreaPage,
-  getWarehouseAreaListAll
+	getWarehouseAreaListAll,
-} from "@/api/warehouse/warehouse-area-setup";
+} from '@/api/warehouse/warehouse-area-setup';
-import {
+import { getWarehouseList } from '@/api/warehouse/warehouse-setup';
-  getWarehouseList
-} from "@/api/warehouse/warehouse-setup";
 import tableHeightMixin from '@/mixins/tableHeightMixin';
 
 const tableProps = [
@@ -79,7 +76,7 @@ const tableProps = [
 ];
 
 export default {
-	mixins: [basicPage,tableHeightMixin],
+	mixins: [basicPage, tableHeightMixin],
 	data() {
 		return {
 			urlOptions: {
@@ -94,13 +91,13 @@ export default {
 							btnName: '编辑',
 					  }
 					: undefined,
-          this.$auth.hasPermi(`warehouse:warehouse-area-setup:delete`)
+				this.$auth.hasPermi(`warehouse:warehouse-area-setup:delete`)
 					? {
 							type: 'delete',
 							btnName: '删除',
 					  }
 					: undefined,
-			].filter((v)=>v),
+			].filter((v) => v),
 			tableData: [],
 			formConfig: [
 				{
@@ -129,7 +126,9 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('warehouse:warehouse-area-setup:create') ? 'button' : '',
+					type: this.$auth.hasPermi('warehouse:warehouse-area-setup:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -148,7 +147,7 @@ export default {
 		getWarehouseAreaListAll().then((response) => {
 			this.formConfig[1].selectOptions = response.data;
 		});
-  },
+	},
 	methods: {
 		buttonClick(val) {
 			switch (val.btnName) {
@@ -180,6 +179,22 @@ export default {
 					console.log(val);
 			}
 		},
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+			getWarehouseAreaListAll().then((response) => { //刷新搜索框库区
+				this.formConfig[1].selectOptions = response.data;
+			});
+      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+        if (response.hasOwnProperty('data')) {
+          this.tableData = response.data.list;
+          this.listQuery.total = response.data.total;
+        } else {
+          this.tableData = []
+        }
+        this.dataListLoading = false;
+      });
+    },
 	},
 };
 </script>

src/views/warehouse/warehouse-base/warehouse-location-setup/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 13:52:10
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-21 10:26:21
+ * @LastEditTime: 2024-12-16 16:30:12
  * @Description:
 -->
 <template>
@@ -35,7 +35,7 @@
 				<el-form-item label="库区名称" prop="areaId">
 					<el-select
 						v-model="dataForm.areaId"
-            :disabled="!areaArr.length>0"
+						:disabled="!areaArr.length > 0"
 						filterable
 						:style="{ width: '100%' }"
 						@change="setAreaType"
@@ -204,18 +204,22 @@ export default {
 	},
 	created() {
 		getWarehouseList().then((response) => {
-			this.warehouseArr = response.data;
+			this.warehouseArr = response.data.filter((item) =>
+				item.type === 1
+			);
 		});
 	},
 	methods: {
-    getAreaList(){
+		getAreaList() {
-		getWarehouseAreaList(this.dataForm.warehouseId).then((response) => {
+			getWarehouseAreaList(this.dataForm.warehouseId).then((response) => {
-			this.areaArr = response.data;
+				this.areaArr = response.data;
-      if(this.areaArr.length===0){
+        this.dataForm.areaId = null
-        this.$message('该仓库下暂无库区');
+        this.dataForm.areaType = null
-      }
+				if (this.areaArr.length === 0) {
-		});
+					this.$message('该仓库下暂无库区');
-    },
+				}
+			});
+		},
 		setAreaType() {
 			if (this.dataForm.areaId) {
 				this.dataForm.areaType = this.areaArr.find(

src/views/warehouse/warehouse-manage/in&out/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2024-08-02 16:26:58
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-08 16:38:53
+ * @LastEditTime: 2024-12-19 14:15:06
  * @Description:,
 -->
 <template>
@@ -103,7 +103,7 @@ export default {
 	},
 	created() {
 		getUserProfile().then((response) => {
-			this.dataForm.operator = response.data.username;
+			this.dataForm.operator = response.data.nickname;
 		});
 	},
 	methods: {

src/views/warehouse/warehouse-manage/in&out/index.vue

@@ -67,6 +67,14 @@ const tableProps = [
 		prop: 'warehouseName',
 		label: '仓库名称',
 	},
+	{
+		prop: 'areaName',
+		label: '库区名称',
+	},
+	{
+		prop: 'areaType',
+		label: '库区类型',
+	},
 	{
 		prop: 'name',
 		label: '库位名称',
@@ -95,6 +103,10 @@ const tableProps = [
 		filter: parseTime,
 		width: 150,
 	},
+	{
+		prop: 'goodsName',
+		label: '物品名称',
+	},
 	{
 		prop: 'remark',
 		label: '备注',

src/views/warehouse/warehouse-report/relocationHistory/index.vue

@@ -18,7 +18,7 @@
 				v-if="tableBtn.length"
 				slot="handleBtn"
 				:width="90"
-				label="库位详情"
+				label="详情"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
 		</base-table>
@@ -70,10 +70,12 @@ const tableProps = [
 	{
 		prop: 'oldCode',
 		label: '源库位编码',
+		width: 150,
 	},
 	{
 		prop: 'palletCode',
 		label: '移动托盘编码',
+		width: 150,
 	},
 	{
 		prop: 'goodName',