去除限制3档计价

Reviewed-on: #421

.env.dev

@@ -1,8 +1,8 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-09-02 09:07:05
+ # @LastEditTime: 2024-11-07 09:29:23
- # @LastEditors: zhp
+ # @LastEditors: zwq
  # @Description:
 ###
 # 开发环境配置
@@ -12,22 +12,13 @@ ENV = 'development'
 VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://100.64.0.26:48082'
+# VUE_APP_BASE_API = 'http://172.16.21.222:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://mes2.kszny.picaiba.com'
-# VUE_APP_BASE_API = 'http://192.168.4.173:48080'
-# VUE_APP_BASE_API = 'http://192.168.2.173:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.81:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.8:48082'
-# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.56:48082'
-# VUE_APP_BASE_API = 'http://192.168.4.159:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.64:48082'
-VUE_APP_BASE_API = 'http://192.168.1.20:48082'
 
 
 
 # 积木报表指向地址
-VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
+VUE_APP_JIMU_API = 'http://mes2.kszny.picaiba.com'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.prod

@@ -1,8 +1,8 @@
 ###
  # @Author: zhp
  # @Date: 2023-11-07 19:11:40
- # @LastEditTime: 2023-11-16 16:40:59
+ # @LastEditTime: 2024-10-17 09:09:05
- # @LastEditors: zhp
+ # @LastEditors: zwq
  # @Description:
 ###
 # 生产环境配置
@@ -12,15 +12,18 @@ ENV = 'production'
 VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+# VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = ''
 
 # 积木报表指向地址
-VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
+# VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
+VUE_APP_JIMU_API = ''
 
 
 # 根据服务器或域名修改
 # PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
-PUBLIC_PATH = 'http://192.168.0.33:8889/'
+# PUBLIC_PATH = 'http://192.168.0.33:8889/'
+PUBLIC_PATH = ''
 
 # 二级部署路径
 VUE_APP_APP_NAME ='yudao-admin'

package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "local": "vue-cli-service serve --mode local",
-    "dev": "vue-cli-service serve --mode dev",
+    "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --mode dev",
     "front": "vue-cli-service serve --mode front",
     "build:prod": "vue-cli-service build --mode prod",
     "build:stage": "vue-cli-service build --mode stage",

src/api/analysis/energyAnalysis.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: zwq
+ * @Date: 2024-06-28 17:03:29
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-09-27 09:24:09
+ * @Description:
+ */
 import request from '@/utils/request'
 
 // 获取走势分析数据
@@ -17,6 +24,15 @@ export function exportTrend(data) {
     responseType: 'blob'
   })
 }
+// 导出对比分析数据
+export function exportCompare(data) {
+  return request({
+    url: '/analysis/energy-analysis/exportCompare',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}
 // 获取对比分析数据
 export function getCompare(data) {
   return request({
@@ -35,6 +51,24 @@ export function getYoy(data) {
   })
 }
 
+// 导出同比分析数据
+export function exportYoy(data) {
+  return request({
+    url: '/analysis/energy-analysis/exportYoy',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}
+// 导出环比分析数据
+export function exportChain(data) {
+  return request({
+    url: '/analysis/energy-analysis/exportChain',
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}
 // 获取环比分析数据(1:月,2:周,3:日)
 export function getQoq(data) {
   return request({

src/api/base/coreDepartment.js

@@ -3,7 +3,7 @@
  * @Date: 2023-10-21 11:50:46
  * @LastEditTime: 2023-10-30 14:37:28
  * @LastEditors: DY
- * @Description: 
+ * @Description:
  */
 import request from '@/utils/request'
 
@@ -65,4 +65,11 @@ export function getCoreDepartmentList(query) {
     method: 'get',
     params: query
   })
-}
+}
+export function getDepartmentList(query) {
+  return request({
+    url: '/system/dept/list',
+    method: 'get',
+    params: query
+  })
+}

src/api/base/coreWorkOrder.js

@@ -1,9 +1,9 @@
 /*
  * @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: 
+ * @Description:
  */
 import request from '@/utils/request'
 
@@ -16,6 +16,14 @@ export function createCoreWO(data) {
   })
 }
 
+// 获取工艺模式工单预计消耗物料
+export function getMaterialCostWorkOrder(data) {
+  return request({
+    url: '/extend/process-retrospect/getMaterialCostWorkOrder',
+    method: 'post',
+    data: data
+  })
+}
 // 更新工单
 export function updateCoreWO(data) {
   return request({
@@ -153,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/orderManage.js

@@ -50,6 +50,22 @@ export function getOrderById(query) {
     params: query
   })
 }
+// 订单进度-获取普通模式订单剩余数量
+export function getOrderRemainNum(id) {
+  return request({
+    url: '/base/order/getOrderRemainNum?id=' + id,
+    method: 'get'
+  })
+}
+
+// 订单进度-获取工艺模式订单预计消耗物料（计算后）
+export function getMaterialCostOrder(data) {
+  return request({
+    url: '/extend/process-retrospect/getMaterialCostOrder',
+    method: 'post',
+    data: data
+  })
+}
 
 // 获得工艺流程列表
 export function getProcessFlowList() {
@@ -59,6 +75,16 @@ export function getProcessFlowList() {
   })
 }
 
+
+// 获得工艺流程列表
+export function getProcessFlowPage(query) {
+  return request({
+    url: '/extend/process-flow/page',
+    method: 'get',
+    params: query
+  })
+}
+
 // 创建订单
 export function orderCreate(data) {
   return request({
@@ -181,11 +207,11 @@ export function getDetailTree(data) {
     params: data
   })
 }
-export function getDetailTreeInfo(data) {
+export function getDetailTreeInfo(query) {
   return request({
-    url: 'base/order/getDetailTreeInfoById',
+    url: 'base/order/getDetailTreeInfoByIdNew',
     method: 'get',
-    params: data
+    params: query
   })
 }
 

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/inspection/items.js

@@ -5,13 +5,6 @@
  * @LastEditors: zhp
  * @Description:
  */
-/*
- * @Author: zhp
- * @Date: 2024-07-12 15:31:41
- * @LastEditTime: 2024-07-22 09:33:20
- * @LastEditors: zhp
- * @Description:
- */
 import request from '@/utils/request'
 
 
@@ -26,7 +19,7 @@ export function getItemPageData(data) {
   return request({
     url: '/base/equipment-check-program/page',
     method: 'get',
-    data
+    params: data
   })
 }
 

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/api/equipment/base/maintain/record.js

@@ -3,7 +3,7 @@
  * @Date: 2023-11-08 15:56:52
  * @LastEditTime: 2024-02-26 17:02:53
  * @LastEditors: DY
- * @Description: 
+ * @Description:
  */
 import request from '@/utils/request'
 
@@ -78,3 +78,11 @@ export function deleteLogDet(id) {
     method: 'delete'
   })
 }
+
+export function getEqMaintainPlanPageData(query) {
+  return request({
+    url: '/base/equipment-maintain-plan-det/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/quality/processTraceability.js

@@ -27,7 +27,7 @@ export function getWorkOrderList(query) {
 
 export function getCoreProduct(id) {
   return request({
-    url: '/base/core-product/get?id=' + id,
+    url: '/base/core-product-material/get?id=' + id,
     method: 'get'
   })
 }

src/api/system/role.js

@@ -44,11 +44,7 @@ export function updateRole(data) {
 }
 
 // 角色状态修改
-export function changeRoleStatus(id, status) {
+export function changeRoleStatus(data) {
-  const data = {
-    id,
-    status
-  }
   return request({
     url: '/system/role/update-status',
     method: 'put',

src/components/ButtonNav/index.vue

@@ -1,10 +1,3 @@
-<!--
-    filename: index.vue
-    author: liubin
-    date: 2024-04-02 09:49:36
-    description:
--->
-
 <template>
   <!-- 按钮切换 -->
   <div v-if="buttonMode" class="button-nav">
@@ -12,9 +5,8 @@
       v-for="m in menus"
       :key="m"
       @click="currentMenu = m"
-      :data-text="m"
       :class="[m === currentMenu ? 'active' : '']"
-    ></button>
+    >{{m}}</button>
   </div>
   <!-- 标签切换 -->
   <div v-else class="custom-tabs" style="height: 100%; width: 100%">
@@ -75,33 +67,24 @@ export default {
   }
 
   button {
+    height: 48px;
+    line-height: 48px;
     cursor: pointer;
     appearance: none;
     outline: none;
     border: none;
     background: #fff;
     border-radius: 8px;
-    padding: 15px;
+    font-size: 16px;
-    color: #888;
+    font-weight: 500;
+    color: rgba(22, 22, 22, 0.65);
     letter-spacing: 2px;
     flex: 1;
     box-sizing: padding-box;
     position: relative;
-
-    &::after {
-      content: attr(data-text);
-      position: absolute;
-      top: 5px;
-      left: 50%;
-      font-size: 16px;
-      font-weight: 500;
-      transform: translate(-50%);
-    }
-
     &.active {
-      color: #111;
+      color: rgba(22, 22, 22, 1);
-      //border-bottom: 2px solid #0b58ff;
+      border-bottom: 4px solid #0b58ff;
-      box-shadow: 0px 2px 1px 1px #0b58ff;
     }
   }
 }

src/mixins/lb/basicPageMixin.js

@@ -28,7 +28,7 @@ export default {
 			// tableBtn: [], // 占位
 			// searchBarFormConfig: [], // 占位
 			// // 弹窗表单配置
-			// dialogFormConfig: [], // 
+			// dialogFormConfig: [], //
 			updateUrl: '',
 			addUrl: '',
 			pageUrl: '',
@@ -109,7 +109,9 @@ export default {
 			}
 		},
 		// 处理搜索栏按钮
-		handleSearchBarBtnClick(btn) {
+    handleSearchBarBtnClick(btn) {
+      console.log(btn);
+
 			// const keys = ['name', 'createTime']; // timeVal // 已被 searchBarKeys 替代
 			switch (btn.btnName) {
 				case 'search':

src/store/modules/permission.js

@@ -23,7 +23,7 @@ const permission = {
       state.topbarRouters = routes
     },
     SET_SIDEBAR_ROUTERS: (state, routes) => {
-      console.log('==SET_SIDEBAR_ROUTERS==:',routes)
+      // console.log('==SET_SIDEBAR_ROUTERS==:',routes)
       state.sidebarRouters = routes
     },
   },

src/utils/dict.js

@@ -89,6 +89,7 @@ export const DICT_TYPE = {
 
   // ============== ENERGY - 能源模块 =============
   ENERGY_UNIT: 'energy_unit',
+  ENERGY_TYPE: 'energy_type',
   EQU_ALARM_LEVEL: 'equ_alarm_level',
   MONITOR_INDEX_TYPE: 'monitor_index_type',
   OBJECT_TYPE: 'object_type',

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/devConfig/energy/energyLimit/index.vue

@@ -92,7 +92,8 @@ export default {
           type: 'select',
           label: '能源类型',
           selectOptions: [],
-          param: 'energyTypeId'
+          param: 'energyTypeId',
+          clearable: false
         },
         {
           type: 'select',
@@ -162,7 +163,6 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
     })
-    this.getList();
     this.getTypeList()
     // 获取对象树形结构
     this.getObjTree()
@@ -171,7 +171,10 @@ export default {
     getTypeList() {
       getEnergyTypeListAll().then((res) => {
         this.formConfig[0].selectOptions = res.data || []
+        this.formConfig[0].defaultSelect = res.data[0].id
+        this.queryParams.energyTypeId = res.data[0].id
         this.energyTypeList = res.data || []
+        this.getList();
       })
     },
     buttonClick(val) {

src/views/devConfig/energy/energyPlcConnect/components/energyPlcParamAdd.vue

@@ -82,6 +82,7 @@ export default {
     init(param) {
       this.form.connectId = param.connectId
       getEnergyTypeListAll().then((res) => {
+        console.log(res)
         this.energyListType = res.data || []
       })
       if (param.id) {

src/views/devConfig/energy/energyPlcConnect/index.vue

@@ -37,7 +37,7 @@
       @cancel="handleCancel"
       @confirm="handleConfirm"
       :before-close="handleCancel"
-      width='30%'
+      width='50%'
     >
       <energy-plc-connect-add ref="energyPlcConnect" :objList="objList" @successSubmit="successSubmit" />
     </base-dialog>
@@ -60,7 +60,8 @@ const tableProps = [
   },
   {
     prop: 'objCode',
-    label: '对象编码'
+    label: '对象编码',
+    minWidth: 160,
   },
   {
     prop: 'plcTableName',
@@ -69,7 +70,8 @@ const tableProps = [
   {
     prop: 'plcTableCode',
     label: '关联表编码',
-    showOverflowtooltip: true
+    showOverflowtooltip: true,
+    minWidth: 160,
   },
   {
     prop: 'cnName',

src/views/devConfig/energy/energyStatistics/components/energyStatisticsAdd.vue

@@ -60,7 +60,8 @@ export default {
         name: '',
         code: '',
         type: '',
-        energyTypeId: ''
+        energyTypeId: '',
+        remark: ''
       },
       plcList: [],
       objList: [],

src/views/devConfig/energy/energyType/components/InnerTable.vue

@@ -16,7 +16,7 @@
       type="text"
       class="tableInnerButton"
       @click="showInnerTable(injectData)"
-      >详情</el-button
+      >价格详情</el-button
     >
   </el-popover>
 </template>

src/views/devConfig/energy/energyType/components/energyTypeAdd.vue

@@ -3,7 +3,14 @@
     <el-row>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="name">
-          <el-input v-model="form.name"></el-input>
+          <el-select v-model="form.name" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.ENERGY_TYPE)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.label">
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -213,10 +220,6 @@ export default {
     // 增加
     emitButtonClick1() {
       let n = this.tableData1.length
-      if (n >=3) {
-        this.$modal.msgWarning('最多可添加3档计价')
-        return false
-      }
       let obj = {}
       obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime
       obj.endTime = ''
@@ -225,10 +228,6 @@ export default {
     },
     emitButtonClick2() {
       let n = this.tableData2.length
-      if (n >=3) {
-        this.$modal.msgWarning('最多可添加3档计价')
-        return false
-      }
       let obj = {}
       obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed
       obj.endUsed = 0

src/views/devConfig/energy/energyType/index.vue

@@ -80,10 +80,14 @@ export default {
     return {
       formConfig: [
         {
-          type: 'input',
+          type: 'select',
           label: '能源类型',
+          selectOptions: this.getDictDatas(this.DICT_TYPE.ENERGY_TYPE),
           placeholder: '能源类型',
-          param: 'name'
+          labelField: 'label',
+          valueField: 'label',
+          param: 'name',
+          flilterable: true
         },
         {
           type: 'button',

src/views/devConfig/quality/qualityInspectionBoxBtn/dialogForm.vue

@@ -13,60 +13,6 @@
 		v-loading="formLoading">
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item
-					label="产线"
-					prop="productionLineId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.productionLineId"
-						placeholder="请选择产线"
-						filterable
-						@change="handleProductlineChange">
-						<el-option
-							v-for="opt in productionLineList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col :span="12">
-				<el-form-item
-					label="工段"
-					prop="sectionId"
-					:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.sectionId"
-						placeholder="请选择工段"
-						filterable
-						@change="$emit('update', dataForm)">
-						<el-option
-							v-for="opt in workshopSectionList"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-
-			<el-col :span="12">
-				<el-form-item
-					label="按钮盒识别码"
-					prop="buttonId"
-					:rules="[
-						{ required: true, message: '不能为空', trigger: 'blur' },
-						{
-							type: 'number',
-							message: '请输入整数',
-							trigger: 'blur',
-							transform: (val) => Number.isInteger(Number(val)) && Number(val),
-						},
-					]">
-					<el-input
-						v-model="dataForm.buttonId"
-						@change="$emit('update', dataForm)"
-						placeholder="请输入整数" />
-				</el-form-item>
 				<el-form-item
 					label="产线"
 					prop="productionLineId"
@@ -130,13 +76,22 @@
 						placeholder="请输入整数" />
 				</el-form-item>
 			</el-col>
-
+			<el-col :span="12">
+				<el-form-item
+					label="按钮盒模式"
+					prop="model">
+					<el-input
+						v-model="dataForm.model"
+						@change="$emit('update', dataForm)"
+						placeholder="请输入按钮盒模式" />
+				</el-form-item>
+			</el-col>
 			<el-col :span="12">
 				<el-form-item
 					label="按钮值"
 					prop="keyValue"
 					:rules="[
-						{ required: true, message: '不能为空', trigger: 'blur' },
+						{ required: true, message: '按钮值不能为空', trigger: 'blur' },
 						{
 							type: 'number',
 							message: '请输入100以内的整数',
@@ -154,17 +109,22 @@
 						min="0"
 						max="100"
 						@change="$emit('update', dataForm)"
-						placeholder="请输入按钮盒模式" />
+						placeholder="请输入按钮值" />
 				</el-form-item>
 			</el-col>
 
 			<el-col :span="12">
-				<el-form-item label="检测内容" prop="inspectionDetId">
+				<el-form-item 
+					label="检测内容"
+					prop="inspectionDetId"
+					:rules="[
+						{ required: true, message: '检测内容不能为空', trigger: 'blur' },
+					]">
 					<el-select
 						v-model="dataForm.inspectionDetId"
 						placeholder="请选择检测内容"
 						filterable
-						@change="$emit('update', dataForm)">
+						@change="handleInspectionDetChange">
 						<el-option
 							v-for="opt in inspectionDetList"
 							:key="opt.value"
@@ -203,14 +163,9 @@ export default {
 	mounted() {
 		this.getProductionLineList();
 		this.getQualityInspectionDetList();
-		// this.getWorksectionList();
+		if (this.dataForm.productionLineId) {
-		// this.getCode('/base/equipment-group-alarm/getCode').then((code) => {
+			this.getWorksectionList(this.dataForm.productionLineId);
-		// 	this.formLoading = false;
+		}
-		// 	this.$emit('update', {
-		// 		...this.dataForm,
-		// 		code,
-		// 	});
-		// });
 	},
 	watch: {
 		'dataForm.productionId': {
@@ -279,11 +234,18 @@ export default {
 			this.dataForm.sectionId = null;
 			this.$emit('update', this.dataForm);
 		},
-
 		async getCode(url) {
 			const response = await this.$axios(url);
 			return response.data;
 		},
+		handleInspectionDetChange(id) {
+			this.inspectionDetList.forEach((item) => {
+				if (item.value == id) {
+					this.dataForm.inspectionDetContent = item.label;
+				}
+			});
+			this.$emit('update', this.dataForm);
+		}
 	},
 };
 </script>

src/views/devConfig/quality/qualityInspectionBoxBtn/index.vue

@@ -40,7 +40,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
+			<DialogForm v-if="open" ref="form" v-model="form"/>
 		</base-dialog>
 	</div>
 </template>
@@ -65,78 +65,6 @@ export default {
 	components: { DialogForm },
 	data() {
 		return {
-			rows: [
-				[
-					{
-						select: true,
-						label: '产线',
-						url: '/base/production-line/listAll',
-						prop: 'productionId',
-						rules: [
-							{ required: true, message: '产线不能为空', trigger: 'blur' },
-						],
-						bind: {
-							filterable: true,
-						},
-					},
-					{
-						select: true,
-						label: '工段',
-						url: '/base/workshop-section/listAll',
-						prop: 'sectionId',
-						rules: [
-							{ required: true, message: '工段不能为空', trigger: 'blur' },
-						],
-						bind: {
-							filterable: true,
-						},
-					},
-				],
-				[
-					{
-						input: true,
-						label: '按钮盒识别码',
-						prop: 'buttonId',
-						rules: [
-							{
-								type: 'number',
-								message: '请输入整数',
-								trigger: 'blur',
-								transform: (val) =>
-									Number.isInteger(Number(val)) && Number(val),
-							},
-						],
-					},
-					{ input: true, label: '按钮盒模式', prop: 'model' },
-				],
-				[
-					{
-						input: true,
-						label: '按钮值',
-						prop: 'keyValue',
-						rules: [
-							{
-								type: 'number',
-								message: '请输入100以内的整数',
-								trigger: 'blur',
-								transform: (val) =>
-									Number(val) <= 100 && Number.isInteger(+val) && Number(val),
-							},
-						],
-						bind: { type: 'number', min: 0, max: 100 },
-					},
-					{
-						select: true,
-						label: '检测内容',
-						url: '/base/quality-inspection-det/listAll',
-						prop: 'inspectionDetId',
-						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							filterable: true,
-						},
-					},
-				],
-			],
 			searchBarFormConfig: [
 				{
 					type: 'input',
@@ -230,6 +158,7 @@ export default {
 				id: null,
 				buttonId: null,
 				inspectionDetId: null,
+				inspectionDetContent: null,
 				productionLineId: null,
 				sectionId: null,
 				model: null,
@@ -256,12 +185,13 @@ export default {
 			this.form = {
 				id: null,
 				buttonId: null,
+				inspectionDetId: null,
 				inspectionDetContent: null,
-				productionId: null,
+				productionLineId: null,
 				sectionId: null,
 				model: null,
 				keyValue: null,
-			};
+			},
 			this.resetForm('form');
 		},
 		/** 新增按钮操作 */

src/views/energy/analysis/contrastAnalysis/components/searchArea.vue

@@ -150,6 +150,10 @@
         <el-button type="primary" size="small" @click="search">查询</el-button>
         <span class="separateStyle"></span>
         <el-button size="small" @click="resetBtn">重置</el-button>
+				<span class="separateStyle"></span>
+				<el-button type="primary" size="small" @click="exportData" plain>
+					导出
+				</el-button>
       </el-form-item>
     </el-form>
     <span v-if="isFold" class="foldClass" @click='switchMode'>
@@ -215,6 +219,7 @@ export default {
     getTypeList() {
       getEnergyTypeListAll().then((res) => {
         this.energyTypeList = res.data || []
+        this.queryParams.energyTypeId = res.data[0].id
       })
     },
     // 范围选择器
@@ -326,8 +331,16 @@ export default {
           })
       }
     },
+		// 查询
+		search() {
+			if (this.validateData()) {
+				this.queryParams.startTime = this.queryParams.startTime + '';
+				this.queryParams.endTime = this.queryParams.endTime + '';
+				this.$emit('submit', this.queryParams);
+			}
+		},
     // 查询
-    search() {
+    validateData() {
       if (!this.queryParams.energyTypeId) {
         this.$modal.msgError('请选择能源类型')
         return false
@@ -397,10 +410,7 @@ export default {
         this.$modal.msgError('请选择对象')
         return false
       }
-      this.queryParams.startTime = this.queryParams.startTime + ''
+			return true;
-      this.queryParams.endTime = this.queryParams.endTime + ''
-      console.log(this.queryParams)
-      this.$emit('submit', this.queryParams)
     },
     resetBtn() {
       this.queryParams.energyTypeId = null
@@ -436,7 +446,14 @@ export default {
       } else {
         element.classList.add('divHeight')
       }
-    }
+    },
+		exportData() {
+			if (this.validateData()) {
+				this.queryParams.startTime = this.queryParams.startTime + '';
+				this.queryParams.endTime = this.queryParams.endTime + '';
+				this.$emit('exportD', this.queryParams);
+			}
+		},
   }
 }
 </script>
@@ -494,4 +511,4 @@ export default {
   vertical-align: middle;
   margin: 0 10px;
 }
-</style>
+</style>

src/views/energy/analysis/contrastAnalysis/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container contrastAnalysisBox" id="contrastAnalysisBox">
     <!-- 搜索工作栏 -->
-    <search-area  :isFold="isFold" @submit="getList"/>
+    <search-area  :isFold="isFold" @submit="getList"  @exportD="exportData"/>
 		<div v-show="chartData.length">
 			<bar-chart
 				ref="analysisBarChart"
@@ -18,7 +18,7 @@
   </div>
 </template>
 <script>
-import { getCompare } from "@/api/analysis/energyAnalysis"
+import { getCompare ,exportCompare} from "@/api/analysis/energyAnalysis"
 import SearchArea from "./components/searchArea"
 import BarChart from "./components/barChart"
 import tableHeightMixin from '@/mixins/tableHeightMixin';
@@ -85,32 +85,17 @@ export default {
 			}
 			this.tableProps = [{ prop: 'time', label: '时间' }].concat(tempX);
 		},
-		// 导出
+    /** 导出按钮操作 */
-		exportExl() {
+    exportData(val) {
-			if (this.list.length > 0) {
+      // 处理查询参数
-				var wb = XLSX.utils.table_to_book(
+      this.$modal.confirm('是否确认导出对比分析数据?').then(() => {
-					document.querySelector('.contrast-out-table')
+          this.exportLoading = true;
-				);
+          return exportCompare(val);
-				let fileName = '对比分析.xlsx';
+        }).then(response => {
-				var wbout = XLSX.write(wb, {
+          this.$download.excel(response, '对比分析数据.xlsx');
-					bookType: 'xlsx',
+          this.exportLoading = false;
-					bookSST: true,
+        }).catch(() => {});
-					type: 'array',
+    }
-				});
-				try {
-					FileSaver.saveAs(
-						new Blob([wbout], { type: 'application/octet-stream' }),
-						fileName
-					);
-					this.$message.success('导出成功');
-				} catch (e) {
-					if (typeof console !== 'undefined') console.log(e, wbout);
-				}
-				return wbout;
-			} else {
-				this.$modal.msgWarning('暂无数据导出');
-			}
-		},
   }
 }
 </script>

src/views/energy/analysis/index.vue

@@ -7,7 +7,7 @@
 -->
 <template>
 	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
+		<div style="background: #f2f4f9; height: 56px; width: 100%">
 			<ButtonNav
 				:menus="['走势分析', '对比分析', '同比分析', '环比分析']"
 				@change="currentMenu">

src/views/energy/analysis/qoqAnalysis/components/searchArea.vue

@@ -158,14 +158,33 @@ export default {
       this.$emit('submit', this.queryParams)
     },
     exportData() {
-      let name
+      if (this.objArr.length === 0) {
-      if (this.queryParams.objId) {
+        this.$modal.msgError('请选择对象')
-        name = this.getObjName(this.objList, this.queryParams.objId)
+        return false
       } else {
-        this.$modal.msgWarning("对象不能为空")
+        this.queryParams.objId = this.objArr[this.objArr.length-1]
+      }
+      if (!this.queryParams.type) {
+        this.$modal.msgError('请选择时间维度')
         return false
       }
-      this.$emit('exportD', {name: name})
+      if (!this.queryParams.searchTime) {
+        this.$modal.msgError('请选择时间')
+        return false
+      }
+      switch (this.queryParams.type) {
+        case 1:
+          this.queryParams.searchTime = this.transformTime(this.monthValue)
+          break;
+        case 2:
+          let value = moment(this.weekValue).day(6).format('YYYY-MM-DD') + ' 23:59:59'
+          this.queryParams.searchTime = new Date(value).getTime()
+          break;
+        default:
+           let value2 = moment(this.dateValue).format('YYYY-MM-DD') + ' 23:59:59'
+           this.queryParams.searchTime = new Date(value2).getTime()
+      }
+      this.$emit('exportD', this.queryParams)
     },
     // 递归取对象name
     getObjName(list, id) {
@@ -229,4 +248,4 @@ export default {
     margin-top: 10px;
   }
 }
-</style>
+</style>

src/views/energy/analysis/qoqAnalysis/index.vue

@@ -19,7 +19,7 @@
   </div>
 </template>
 <script>
-import { getQoq } from "@/api/analysis/energyAnalysis"
+import { getQoq,exportChain } from "@/api/analysis/energyAnalysis"
 import SearchArea from "./components/searchArea"
 import LineChart from "./components/lineChart"
 import FileSaver from "file-saver"
@@ -89,26 +89,14 @@ export default {
       this.chartData = this.list
     },
     exportData(val) {
-      if (this.list.length > 0) {
+      // 处理查询参数
-        var wb = XLSX.utils.table_to_book(document.querySelector(".qoq-out-table"))
+      this.$modal.confirm('是否确认导出环比分析数据?').then(() => {
-        let fileName = val.name + "环比分析.xlsx"
+          this.exportLoading = true;
-        var wbout = XLSX.write(wb, {
+          return exportChain(val);
-            bookType: "xlsx",
+        }).then(response => {
-            bookSST: true,
+          this.$download.excel(response, '环比分析数据.xlsx');
-            type: "array"
+          this.exportLoading = false;
-        })
+        }).catch(() => {});
-        try {
-            FileSaver.saveAs(
-            new Blob([wbout], { type: "application/octet-stream" }),
-            fileName
-            )
-        } catch (e) {
-            if (typeof console !== "undefined") console.log(e, wbout);
-        }
-        return wbout
-      } else {
-        this.$modal.msgWarning("暂无数据导出")
-      }
     }
   }
 }
@@ -129,4 +117,4 @@ export default {
   margin-right: 8px;
   vertical-align: bottom;
 }
-</style>
+</style>

src/views/energy/analysis/trendAnalysis/components/searchArea.vue

@@ -205,6 +205,7 @@ export default {
 		getTypeList() {
 			getEnergyTypeListAll().then((res) => {
 				this.energyTypeList = res.data || [];
+				this.queryParams.energyTypeId = res.data[0].id
 			});
 		},
 		getObjTree() {

src/views/energy/analysis/yoyAnalysis/components/searchArea.vue

@@ -125,14 +125,26 @@ export default {
       this.$emit('submit', this.queryParams)
     },
     exportData() {
-      let name
+      if (this.objArr.length === 0) {
-      if (this.queryParams.objId) {
+        this.$modal.msgError('请选择对象')
-        name = this.getObjName(this.objList, this.queryParams.objId)
+        return false
       } else {
-        this.$modal.msgWarning("对象不能为空")
+        this.queryParams.objId = this.objArr[this.objArr.length-1]
+      }
+      if (!this.queryParams.type) {
+        this.$modal.msgError('请选择时间维度')
         return false
       }
-      this.$emit('exportD', {name: name})
+      if (!this.queryParams.searchTime) {
+        this.$modal.msgError('请选择时间')
+        return false
+      }
+      if (this.queryParams.type === 3) {
+        this.queryParams.searchTime = this.transformTime(this.yearMonth) + ''
+      } else {
+        this.queryParams.searchTime = this.transformYear(this.yearValue) + ''
+      }
+      this.$emit('exportD', this.queryParams)
     },
     // 递归取对象name
     getObjName(list, id) {
@@ -202,4 +214,4 @@ export default {
   background: #E8E8E8;
   vertical-align: middle;
 }
-</style>
+</style>

src/views/energy/analysis/yoyAnalysis/index.vue

@@ -20,7 +20,7 @@
   </div>
 </template>
 <script>
-import { getYoy } from "@/api/analysis/energyAnalysis"
+import { getYoy,exportYoy } from "@/api/analysis/energyAnalysis"
 import subRate from "./components/subRate.vue"
 import SearchArea from "./components/searchArea"
 import LineChart from "./components/lineChart"
@@ -101,26 +101,14 @@ export default {
       this.chartData = this.list
     },
     exportData(val) {
-      if (this.list.length > 0) {
+      // 处理查询参数
-        var wb = XLSX.utils.table_to_book(document.querySelector(".yoy-out-table"))
+      this.$modal.confirm('是否确认导出同比分析数据?').then(() => {
-        let fileName = val.name + "同比分析.xlsx"
+          this.exportLoading = true;
-        var wbout = XLSX.write(wb, {
+          return exportYoy(val);
-            bookType: "xlsx",
+        }).then(response => {
-            bookSST: true,
+          this.$download.excel(response, '同比分析数据.xlsx');
-            type: "array"
+          this.exportLoading = false;
-        })
+        }).catch(() => {});
-        try {
-            FileSaver.saveAs(
-            new Blob([wbout], { type: "application/octet-stream" }),
-            fileName
-            )
-        } catch (e) {
-            if (typeof console !== "undefined") console.log(e, wbout);
-        }
-        return wbout
-      } else {
-        this.$modal.msgWarning("暂无数据导出")
-      }
     }
   }
 }
@@ -140,4 +128,4 @@ export default {
   margin-right: 8px;
   vertical-align: bottom;
 }
-</style>
+</style>

src/views/equipment/DialogFormZ.vue

@@ -0,0 +1,430 @@
+<!--
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-08-15 10:32:36
+    description: 弹窗的表单组件
+-->
+
+<template>
+  <el-form ref="form" :model="form" :label-width="`${labelWidth}px`" :size="size" :label-position="labelPosition"
+    v-loading="formLoading">
+    <el-row :gutter="20" v-for="(row, rindex) in rows" :key="rindex">
+      <el-col v-for="col in row" :key="col.label" :span="24 / row.length">
+        <el-form-item :label="col.label" :prop="col.prop" :rules="col.rules">
+          <el-input v-if="col.input" v-model="form[col.prop]" @change="$emit('update', form)"
+            :placeholder="`请输入${col.label}`" v-bind="col.bind" />
+          <el-input v-if="col.textarea" type="textarea" v-model="form[col.prop]" :disabled="disabled"
+            @change="$emit('update', form)" :placeholder="`请输入${col.label}`" v-bind="col.bind" />
+          <el-select v-if="col.select" v-model="form[col.prop]" :placeholder="`请选择${col.label}`"
+            @change="$emit('selectupdate', form)" v-bind="col.bind">
+            <el-option v-for="opt in optionListOf[col.prop]" :key="opt.value" :label="opt.label" :value="opt.value" />
+          </el-select>
+          <el-date-picker v-if="col.datetime" v-model="form[col.prop]" type="datetime"
+            :disabled="col.disabled ? col.disabled : disabled" :placeholder="`请选择${col.label}`" value-format="timestamp"
+            @change="$emit('update', form)" v-bind="col.bind">
+          </el-date-picker>
+          <el-switch v-if="col.switch" v-model="form[col.prop]" :disabled="disabled" active-color="#0b58ff"
+            inactive-color="#e1e1e1" @change="$emit('update', form)" v-bind="col.bind"></el-switch>
+          <component v-if="col.subcomponent" :key="col.key" :disabled="disabled" :read-only="disabled"
+            :is="col.subcomponent" v-model="form[col.prop]" :inlineStyle="col.style" @on-change="$emit('update', form)"
+            v-bind="col.bind"></component>
+
+          <div class="upload-area" :class="uploadOpen ? '' : 'height-48'" ref="uploadArea" :key="col.prop"
+            v-if="col.upload">
+            <span class="close-icon" :class="uploadOpen ? 'open' : ''">
+              <el-button type="text" icon="el-icon-arrow-right" @click="handleFilesOpen" />
+            </span>
+            <!-- :file-list="uploadedFileList" -->
+            <el-upload class="upload-in-dialog" v-if="col.upload" :key="col.prop + '__el-upload'" :action="uploadUrl"
+              :headers="uploadHeaders" :show-file-list="false" icon="el-icon-upload2" :disabled="disabled"
+              :before-upload="beforeUpload" :on-success="
+              	(response, file, fileList) => {
+              		handleUploadSuccess(response, file, col.prop);
+              	}
+              " v-bind="col.bind">
+              <el-button size="mini" :disabled="col.bind?.disabled || false">
+                <svg-icon icon-class="icon-upload" style="color: inherit"></svg-icon>
+                上传文件
+              </el-button>
+              <div class="el-upload__tip" slot="tip" v-if="col.uploadTips">
+                {{ col.uploadTips || '只能上传jpg/png文件, 大小不超过2MB' }}
+              </div>
+            </el-upload>
+
+            <uploadedFile class="file" v-for="file in form[col.prop]" :file="file" :key="file.fileUrl"
+              @delete="!disabled && handleDeleteFile(file, col.prop)" />
+          </div>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+import { getAccessToken } from '@/utils/auth';
+import tupleImg from '@/assets/images/tuple.png';
+import cache from '@/utils/cache';
+
+/**
+ * 找到最长的label
+ * @param {*} options
+ */
+function findMaxLabelWidth(rows) {
+	let max = 0;
+	rows.forEach((row) => {
+		row.forEach((opt) => {
+			// debugger;
+			if (!opt.label) return 0;
+			if (opt.label.length > max) {
+				max = opt.label.length;
+				if (opt.label.includes('(')) {
+					max = max - 3
+				}
+			}
+		});
+	});
+	return max;
+}
+
+const uploadedFile = {
+	name: 'UploadedFile',
+	props: ['file'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleDelete() {
+			this.$emit('delete', this.file);
+		},
+		async handleDownload() {
+			const data = await this.$axios({
+				url: this.file.fileUrl,
+				method: 'get',
+				responseType: 'blob',
+			});
+
+			await this.$message.success('开始下载');
+			// create download link
+			const url = window.URL.createObjectURL(data);
+			const link = document.createElement('a');
+			link.href = url;
+			link.download = this.file.fileName;
+			document.body.appendChild(link);
+			link.click();
+			document.body.removeChild(link);
+		},
+	},
+	mounted() {},
+	render: function (h) {
+		return (
+			<div
+				title={this.file.fileName}
+				onClick={this.handleDownload}
+				style={{
+					background: `url(${tupleImg}) no-repeat`,
+					backgroundSize: '14px',
+					backgroundPosition: '0 55%',
+					paddingLeft: '20px',
+					paddingRight: '24px',
+					textOverflow: 'ellipsis',
+					whiteSpace: 'nowrap',
+					overflow: 'hidden',
+					cursor: 'pointer',
+					display: 'inline-block',
+				}}>
+				{this.file.fileName}
+				<el-button
+					type="text"
+					icon="el-icon-close"
+					style="float: right; position: relative; top: 2px; left: 8px; z-index: 100"
+					class="dialog__upload_component__close"
+					onClick={this.handleDelete}
+				/>
+			</div>
+		);
+	},
+};
+
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: { uploadedFile },
+	props: {
+		rows: {
+			type: Array,
+			default: () => [],
+		},
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		hasFiles: {
+			type: Boolean | Array,
+			default: false,
+		},
+		labelPosition: {
+			type: String,
+			default: 'right',
+		},
+		size: {
+			type: String,
+			default: '',
+		}
+	},
+	data() {
+		return {
+			uploadOpen: false,
+			form: {},
+			formLoading: true,
+			optionListOf: {},
+			uploadedFileList: [],
+			dataLoaded: false,
+			uploadHeaders: { Authorization: 'Bearer ' + getAccessToken() },
+			uploadUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/upload', // 上传有关的headers，url都是固定的
+		};
+	},
+	computed: {
+		labelWidth() {
+			let max = findMaxLabelWidth(this.rows);
+			// 每个汉字占20px
+			return max * 20;
+			// return max * 20 + 'px';
+		},
+	},
+	watch: {
+		rows: {
+			handler() {
+				this.$nextTick(() => {
+					this.handleOptions('watch');
+				});
+			},
+			deep: true,
+			immediate: false,
+		},
+		dataForm: {
+			handler(val) {
+				this.form = JSON.parse(JSON.stringify(val));
+				if (this.hasFiles) {
+					if (typeof this.hasFiles == 'boolean' && this.hasFiles) {
+						this.form.files = this.form.files ?? [];
+					} else if (Array.isArray(this.hasFiles)) {
+						this.hasFiles.forEach((prop) => {
+							this.form[prop] = this.form[prop] ?? [];
+						});
+					}
+				}
+			},
+			deep: true,
+			immediate: true,
+		},
+	},
+	mounted() {
+		// 处理 options
+		this.handleOptions();
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		// getCode
+		async getCode(url) {
+			const response = await this.$axios(url);
+			return response.data;
+		},
+		async handleOptions(trigger = 'monuted') {
+			console.log('[dialogForm:handleOptions]');
+			const promiseList = [];
+			this.rows.forEach((cols) => {
+				cols.forEach((opt) => {
+					if (opt.value && !this.form[opt.prop]) {
+						// 默认值
+						this.form[opt.prop] = opt.value;
+					}
+
+					if (opt.options) {
+						this.$set(this.optionListOf, opt.prop, opt.options);
+					} else if (opt.url) {
+						// 如果有 depends，则暂时先不获取，注册一个watcher
+						if (opt.depends) {
+							this.$watch(
+								() => this.form[opt.depends],
+								(id) => {
+									console.log('<', opt.depends, '>', 'changed', id);
+									if (id == null) return;
+									// 清空原有选项
+									this.form[opt.prop] = null;
+									// 获取新的选项
+									this.$axios({
+										url: `${opt.url}?id=${id}`,
+									}).then((res) => {
+										this.$set(
+											this.optionListOf,
+											opt.prop,
+											res.data.map((item) => ({
+												label: item[opt.labelKey ?? 'name'],
+												value: item[opt.valueKey ?? 'id'],
+											}))
+										);
+									});
+								},
+								{
+									immediate: false,
+								}
+							);
+							return;
+						}
+						// 如果是下拉框，或者新增模式下的输入框，才去请求
+						if (opt.select || (opt.input && !this.form?.id)) {
+							promiseList.push(async () => {
+								const response = await this.$axios(opt.url, {
+									method: opt.method ?? 'get',
+								});
+								console.log('[dialogForm:handleOptions:response]', response);
+								if (opt.select) {
+									// 处理下拉框选项
+									const list =
+										'list' in response.data
+											? response.data.list
+											: response.data;
+
+									if (opt.cache) {
+										cache.store(opt.cache, list);
+									}
+
+									this.$set(
+										this.optionListOf,
+										opt.prop,
+										list.map((item) => ({
+											label: item[opt.labelKey ?? 'name'],
+											value: item[opt.valueKey ?? 'id'],
+										}))
+									);
+								} else if (opt.input) {
+									console.log('setting code: ', response.data);
+									// 处理输入框数据
+									this.form[opt.prop] = response.data;
+									// 更新下外部的 dataForm，防止code字段有数据也报空的bug
+									this.$emit('update', this.form);
+								}
+							});
+						}
+					}
+				});
+			});
+
+			console.log('[dialogForm:handleOptions] done!');
+
+			// 如果是 watch 触发的，不需要执行进一步的请求
+			if (trigger == 'watch') {
+				this.formLoading = false;
+				return;
+			}
+			try {
+				await Promise.all(promiseList.map((fn) => fn()));
+				this.formLoading = false;
+				this.dataLoaded = true;
+				// console.log("[dialogForm:handleOptions:optionListOf]", this.optionListOf)
+			} catch (error) {
+				console.log('[dialogForm:handleOptions:error]', error);
+				this.formLoading = false;
+			}
+			if (!promiseList.length) this.formLoading = false;
+		},
+		// 上传成功的特殊处理
+		beforeUpload() {},
+		// 上传前的验证规则可通过 bind 属性传入
+		handleUploadSuccess(response, file, prop) {
+			console.log('[handleUploadSuccess]', response, file, prop);
+			this.form[prop].push({
+				fileName: file.name,
+				fileUrl: response.data,
+				fileType: prop == 'files' ? 2 : 1,
+			});
+			this.$modal.msgSuccess('上传成功');
+			this.$emit('update', this.form);
+		},
+
+		getFileName(fileUrl) {
+			return fileUrl.split('/').pop();
+		},
+
+		handleFilesOpen() {
+			this.uploadOpen = !this.uploadOpen;
+		},
+
+		handleDeleteFile(file, prop) {
+			this.form[prop] = this.form[prop].filter(
+				(item) => item.fileUrl != file.fileUrl
+			);
+			this.$emit('update', this.form);
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+
+.upload-area {
+	// background: #ccc;
+	// display: grid;
+	// grid-auto-rows: 34px;
+	// grid-template-columns: repeat(6, minmax(32px, max-content));
+	// gap: 8px;
+	// align-items: center;
+	position: relative;
+	overflow: hidden;
+	transition: height 0.3s ease-out;
+}
+
+.upload-in-dialog {
+	// display: inline-block;
+	margin-right: 24px;
+	// background: #ccc;
+	position: relative;
+	// top: -13px;
+	float: left;
+}
+
+.close-icon {
+	// background: #ccc;
+	position: absolute;
+	top: 0;
+	right: 12px;
+	z-index: 100;
+	transition: transform 0.3s ease-out;
+}
+
+.close-icon.open {
+	transform: rotateZ(90deg);
+}
+</style>
+
+<style>
+.dialog__upload_component__close {
+	color: #ccc;
+}
+.dialog__upload_component__close:hover {
+	/* color: #777; */
+	color: red;
+}
+
+.height-48 {
+	height: 35px !important;
+}
+</style>

src/views/equipment/analysis/quality/index.vue

@@ -252,7 +252,7 @@ export default {
 	computed: {},
 	created() {
 		this.fillLineOptions();
-		this.fillProductOptions();
+		// this.fillProductOptions();
 	},
 	mounted() {
 		// window.addEventListener('resize', () => {
@@ -284,23 +284,23 @@ export default {
 			);
 		},
 
-		async fillProductOptions() {
+		// async fillProductOptions() {
-			const { data } = await this.$axios({
+		// 	const { data } = await this.$axios({
-				url: '/base/core-product/listAll',
+		// 		url: '/base/core-product/listAll',
-				method: 'get',
+		// 		method: 'get',
-			});
+		// 	});
-			const cfg = this.searchBarFormConfig.find(
+		// 	const cfg = this.searchBarFormConfig.find(
-				(item) => item.__index == 'product'
+		// 		(item) => item.__index == 'product'
-			);
+		// 	);
-			this.$set(
+		// 	this.$set(
-				cfg,
+		// 		cfg,
-				'selectOptions',
+		// 		'selectOptions',
-				data.map((item) => ({
+		// 		data.map((item) => ({
-					id: item.id,
+		// 			id: item.id,
-					name: item.name,
+		// 			name: item.name,
-				}))
+		// 		}))
-			);
+		// 	);
-		},
+		// },
 
 		async getList() {
 			const { data } = await this.$axios({

src/views/equipment/base/config/BindGroup/index.vue

@@ -119,12 +119,12 @@ export default {
 		return {
 			searchBarKeys: ['groupId', 'equipmentName'],
 			tableBtn: [
-				this.$auth.hasPermi('equipment:bind-group:update')
+				// this.$auth.hasPermi('equipment:bind-group:update')
-					? {
+				// 	? {
-							type: 'detail',
+				// 			type: 'detail',
-							btnName: '查看报警',
+				// 			btnName: '查看报警',
-					  }
+				// 	  }
-					: undefined,
+				// 	: undefined,
 				this.$auth.hasPermi('equipment:bind-group:update')
 					? {
 							type: 'edit',
@@ -371,8 +371,8 @@ export default {
 		},
 		handleTableBtnClick({ data, type }) {
 			switch (type) {
-				case 'edit':
+        case 'edit':
-					this.handleDetail(data, 'edit');
+          this.handleUpdate(data)
 					break;
 				case 'delete':
 					this.handleDelete(data);
@@ -397,7 +397,7 @@ export default {
 			this.reset();
 			this.open = true;
 			this.title = '添加设备与分组绑定';
-		},
+    },
 		/** 修改按钮操作 */
 		handleUpdate(row) {
 			this.reset();
@@ -432,19 +432,19 @@ export default {
 			});
 		},
 		// 查看报警
-		handleDetail(row, mode = 'detail') {
+		// handleDetail(row, mode = 'detail') {
-			const { equipmentId, equipmentName, groupCode, groupId, groupName, id } =
+		// 	const { equipmentId, equipmentName, groupCode, groupId, groupName, id } =
-				row;
+		// 		row;
-			// 打开抽屉
+		// 	// 打开抽屉
-			this.editMode = mode;
+		// 	this.editMode = mode;
-			this.alarmForm.id = groupId;
+		// 	this.alarmForm.id = groupId;
-			this.alarmForm.equipmentGroupCode = groupCode;
+		// 	this.alarmForm.equipmentGroupCode = groupCode;
-			this.alarmForm.equipmentGroupName = groupName;
+		// 	this.alarmForm.equipmentGroupName = groupName;
-			this.editVisible = true;
+		// 	this.editVisible = true;
-			this.$nextTick(() => {
+		// 	this.$nextTick(() => {
-				this.$refs['drawer'].init();
+		// 		this.$refs['drawer'].init();
-			});
+		// 	});
-		},
+		// },
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const id = row.id;

src/views/equipment/base/config/DataCollection/CollectionConfig.vue

@@ -1,8 +1,8 @@
-<!-- 
+<!--
     filename: CollectionConfig.vue
     author: liubin
     date: 2023-10-30 10:09:03
-    description: 
+    description:
 -->
 
 <template>
@@ -198,8 +198,8 @@ export default {
 				},
 				{
 					type: 'select',
-					label: '关联表编码',
+          label: '标识名称',
-					placeholder: '请选择关联表编码',
+					placeholder: '请选择标识名称',
 					param: 'plcId',
 					selectOptions: [],
 					filterable: true,

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

@@ -1,160 +1,100 @@
 <!--
  * @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>
-	<el-drawer
+  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="true" :before-close="beforeClose"
-		:visible.sync="visible"
+    class="drawer" size="60%">
-		:show-close="false"
+    <small-title slot="title" :no-padding="true">
-		:wrapper-closable="true"
+      {{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
-		:before-close="beforeClose"
+    </small-title>
-		class="drawer"
+    <div class="content">
-		size="60%">
+      <div class="visual-part">
-		<small-title slot="title" :no-padding="true">
+        <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
-			{{ isdetail ? '详情' : !dataForm.id ? '新增' : '编辑' }}
+          label-width="100px" label-position="top">
-		</small-title>
+          <el-row :gutter="20">
-		<div class="content">
+            <el-col :span="8">
-			<div class="visual-part">
+              <el-form-item label="巡检单名称" prop="name">
-				<el-form
+                <el-input v-model="dataForm.name" :disabled="isdetail" placeholder="请输入巡检单名称" />
-					:model="dataForm"
+              </el-form-item>
-					:rules="dataRule"
+            </el-col>
-					ref="dataForm"
+            <el-col :span="8">
-					@keyup.enter.native="dataFormSubmit()"
+              <el-form-item label="部门" prop="departmentId">
-					label-width="100px"
+                <el-select v-model="dataForm.departmentId" :disabled="isdetail" :placeholder="`请选择部门`"
-					label-position="top">
+                  style="width: 100%">
-					<el-row :gutter="20">
+                  <el-option v-for="opt in departmentOptions" :key="opt.id" :label="opt.name" :value="opt.id" />
-						<el-col :span="8">
+                </el-select>
-							<el-form-item label="巡检单名称" prop="name">
+              </el-form-item>
-								<el-input v-model="dataForm.name" :disabled="isdetail" placeholder="请输入巡检单名称" />
+            </el-col>
-							</el-form-item>
+            <el-col :span="8">
-						</el-col>
+              <el-form-item label="班次" prop="groupClass">
-						<el-col :span="8">
+                <el-select v-model="dataForm.groupClass" filterable clearable multiple :disabled="isdetail"
-							<el-form-item label="部门" prop="departmentId">
+                  style="width: 100%" placeholder="请选择班次">
-								<el-select
+                  <el-option v-for="d in groupOptions" :key="d.id" :label="d.label" :value="d.label" />
-									v-model="dataForm.departmentId"
+                </el-select>
-									:disabled="isdetail"
+              </el-form-item>
-									:placeholder="`请选择部门`"
+            </el-col>
-									style="width: 100%">
+          </el-row>
-									<el-option
+          <el-row :gutter="20">
-										v-for="opt in departmentOptions"
+            <el-col :span="8">
-										:key="opt.id"
+              <el-form-item label="巡检人" prop="checkPerson">
-										:label="opt.name"
+                <!-- <el-input v-model="dataForm.checkPerson" :disabled="isdetail" placeholder="请输入巡检人" /> -->
-										:value="opt.id" />
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="班次" prop="groupClass">
-								<el-select
-									v-model="dataForm.groupClass"
-									filterable
-									clearable
-									multiple
-									:disabled="isdetail"
-									style="width: 100%"
-									placeholder="请选择班次">
-									<el-option
-										v-for="d in groupOptions"
-										:key="d.id"
-										:label="d.label"
-										:value="d.label" />
-								</el-select>
-							</el-form-item>
-						</el-col>
-					</el-row>
-					<el-row :gutter="20">
-						<el-col :span="8">
-							<el-form-item label="巡检人" prop="checkPerson">
-								<el-select
-									v-model="dataForm.checkPerson"
-									:placeholder="`请选择巡检人`"
-									multiple
-									clearable
-									:disabled="isdetail"
-									filterable
-									style="width: 100%">
-									<el-option
-										v-for="opt in inspectorOptions"
-										:key="opt.value"
-										:label="opt.label"
-										:value="opt.label" />
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :span="8">
-							<el-form-item label="实际巡检时间" prop="actualCheckTime">
-								<el-date-picker
-									v-model="dataForm.actualCheckTime"
-									type="datetime"
-									:disabled="isdetail"
-									placeholder="请选择实际巡检时间"
-									value-format="timestamp"
-									style="width: 100%" />
-							</el-form-item>
-						</el-col>
-					</el-row>
-				</el-form>
-			</div>
 
-			<div v-if="idAttrShow">
+                <el-select v-model="dataForm.checkPerson" :placeholder="`请选择巡检人`" multiple clearable
-				<small-title>
+                  :disabled="isdetail" filterable style="width: 100%">
-					巡检内容
+                  <el-option v-for="opt in inspectorOptions" :key="opt.value" :label="opt.label" :value="opt.label" />
-				</small-title>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="实际巡检时间" prop="actualCheckTime">
+                <el-date-picker v-model="dataForm.actualCheckTime" type="datetime" :disabled="isdetail"
+                  placeholder="请选择实际巡检时间" value-format="timestamp" style="width: 100%" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
 
-				<div v-if="!isdetail" style="display: flex">
+      <div v-if="idAttrShow">
-					<SearchBar
+        <small-title>
-						:formConfigs="searchBarFormConfig"
+          巡检内容
-						ref="attr-search-bar"
+        </small-title>
-						@headBtnClick="handleSearchBarBtnClick" />
-					<!-- <div class="action_btn"> -->
-					<el-button type="text" class="action_btn" @click="addNew()">
-						<span style="display: inline-block;">
-							<svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
-							<span class="add">添加内容</span>
-						</span>
-					</el-button>
-					<!-- </div> -->
-				</div>
-				<base-table
-					:table-props="tableProps"
-					:page="listQuery.pageNo"
-					:limit="listQuery.pageSize"
-					:table-data="detList">
-					<method-btn
-						v-if="!isdetail"
-						slot="handleBtn"
-						:width="120"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-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>
+        <div v-if="!isdetail" style="display: flex">
+          <SearchBar :formConfigs="searchBarFormConfig" ref="attr-search-bar" @headBtnClick="handleSearchBarBtnClick" />
+          <!-- <div class="action_btn"> -->
+          <el-button type="text" class="action_btn" @click="addNew()">
+            <span style="display: inline-block;">
+              <svg-icon style="width: 14px; height: 14px" class="item-icon" icon-class="table_add" />
+              <span class="add">添加内容</span>
+            </span>
+          </el-button>
+          <!-- </div> -->
+        </div>
+        <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+          :table-data="detList">
+          <method-btn v-if="!isdetail" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
+            @clickBtn="handleClick" />
+        </base-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 v-if="!isdetail" class="drawer-body__footer">
+    </div>
-			<el-button @click="goback()">取消</el-button>
-			<!-- <el-button :disabled="isdetail" @click="init(dataForm.id)">重置</el-button> -->
-			<el-button v-if="isshowConfirm" type="primary" @click="confirmIns()">保存</el-button>
-			<el-button v-else type="primary" @click="dataFormSubmit()">保存</el-button>
-		</div>
 
-		<attr-add
+    <div v-if="!isdetail" class="drawer-body__footer">
-			v-if="addOrUpdateVisible"
+      <el-button @click="goback()">取消</el-button>
-			ref="addOrUpdate"
+      <!-- <el-button :disabled="isdetail" @click="init(dataForm.id)">重置</el-button> -->
-			:order-id="dataForm.id"
+      <el-button v-if="isshowConfirm" type="primary" @click="confirmIns()">保存</el-button>
-			@refreshDataList="getList" />
+      <el-button v-else type="primary" @click="dataFormSubmit()">保存</el-button>
-	</el-drawer>
+    </div>
+
+    <attr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :order-id="dataForm.id" @refreshDataList="getList" />
+  </el-drawer>
 </template>
 
 <script>
@@ -305,15 +245,15 @@ export default {
 					}))
 				);
 			}
-			const workerlist = await this.$axios('/base/core-worker/listAll');
+			// const workerlist = await this.$axios('/base/core-worker/listAll');
-			if (workerlist.code == 0) {
+			// if (workerlist.code == 0) {
-				inspectorList = inspectorList.concat(
+			// 	inspectorList = inspectorList.concat(
-					workerlist.data.map((item) => ({
+			// 		workerlist.data.map((item) => ({
-						label: item.name,
+			// 			label: item.name,
-						value: item.id,
+			// 			value: item.id,
-					}))
+			// 		}))
-				);
+			// 	);
-			}
+			// }
 			this.inspectorOptions = inspectorList;
 			// const res1 = await groupClassesListAll();
 			// this.groupOptions = res1.data || [];
@@ -453,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'
@@ -194,7 +195,9 @@ export default {
 	},
 	methods: {
 		/** 批量确认 */
-		async searchBarClicked(btn) {
+    async handleSearchBarBtnClick(btn) {
+      console.log(11111);
+
 			switch (btn.btnName) {
 				case 'batchConfirm':
 					if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
@@ -211,11 +214,45 @@ 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) => {
+							this.getList();
+							res.code == 0 && this.$modal.msgSuccess('确认成功');
+							res.code != 0 && this.$modal.msgError('确认失败');
+						})
+						.catch(() => {});
+				case 'batchConfirm2':
+					if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
+						this.$message.warning('请选择待确认的设备巡检单');
+						return;
+					}
+					this.$modal
+						.confirm('是否确认所有选中巡检单"?')
+						.then(() => {
+							// let checkPersonParam = '';
+							// if (!row.checkPerson || row.checkPerson.trim() == '') {
+							// 	/** 如有必要，更新巡检人 */
+							// 	checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
+							// }
+							return this.$axios({
+								// url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
+								url: `/base/equipment-check-order/confirm2`,
+								method: 'put',
+								data: {
+									ids: this.$refs['waiting-list-table'].selectedPlan.map(
+										(item) => item.id
+									),
+									confirmBy: this.$store.getters.nickname,
+								},
 							});
 						})
 						.then((res) => {
@@ -224,34 +261,15 @@ export default {
 							res.code != 0 && this.$modal.msgError('确认失败');
 						})
             .catch(() => { });
-        case 'batchConfirm2':
+          break;
-          if (this.$refs['waiting-list-table'].selectedPlan.length == 0) {
+        case 'search':
-            this.$message.warning('请选择待确认的设备巡检单');
+          this.getList()
-            return;
+          break;
-          }
+        case 'add':
-          this.$modal
+          this.addOrUpdateVisible = true;
-            .confirm('是否确认所有选中巡检单"?')
+          this.$nextTick(() => {
-            .then(() => {
+            this.$refs.addOrUpdate.init();
-              // let checkPersonParam = '';
+          });
-              // if (!row.checkPerson || row.checkPerson.trim() == '') {
-              // 	/** 如有必要，更新巡检人 */
-              // 	checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
-              // }
-              return this.$axios({
-                // url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
-                url: `/base/equipment-check-order/confirm2?confirmPerson=${this.$store.getters.nickname}`,
-                method: 'put',
-                data: this.$refs['waiting-list-table'].selectedPlan.map(
-                  (item) => item.id
-                ),
-              });
-            })
-            .then((res) => {
-              this.getList();
-              res.code == 0 && this.$modal.msgSuccess('确认成功');
-              res.code != 0 && this.$modal.msgError('确认失败');
-            })
-            .catch(() => { });
 					break;
 			}
 		},
@@ -311,7 +329,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 +345,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 +394,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 +480,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 +498,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 +521,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 +536,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/inspection/Settings/add-or-updata.vue

@@ -6,84 +6,60 @@
  * @Description:
 -->
 <template>
-	<el-drawer
+  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="true" class="drawer" size="50%">
-		:visible.sync="visible"
+    <small-title slot="title" :no-padding="true">
-		:show-close="false"
+      <!-- {{ isdetail ? '详情' : '添加巡检' }} -->
-		:wrapper-closable="true"
+      {{ '添加内容' }}
-		class="drawer"
+    </small-title>
-		size="50%">
+    <div class="content">
-		<small-title slot="title" :no-padding="true">
+      <div class="visual-part">
-			<!-- {{ isdetail ? '详情' : '添加巡检' }} -->
-			{{ '添加内容' }}
-		</small-title>
-		<div class="content">
-			<div class="visual-part">
         <el-row :gutter="20">
           <el-col :span="8">
             <div class="blodTip">巡检单名称</div>
             <div class="lightTip">{{ dataForm.name }}</div>
           </el-col>
-					<el-col :span="8">
+          <el-col :span="8">
             <div class="blodTip">部门</div>
             <div class="lightTip">{{ dataForm.department }}</div>
           </el-col>
-					<el-col :span="8">
+          <el-col :span="8">
-            <div class="blodTip">巡检时间</div>
+            <div class="blodTip">计划巡检时间</div>
             <div class="lightTip">{{ parseTime(dataForm.planCheckTime) }}</div>
           </el-col>
         </el-row>
-			</div>
+      </div>
 
-			<el-divider />
+      <el-divider />
 
-			<div class="attr-list">
+      <div class="attr-list">
-				<small-title
+        <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
-					style="margin: 16px 0; padding-left: 8px"
+          巡检内容
-					:no-padding="true">
+        </small-title>
-					巡检内容
-				</small-title>
 
-				<div v-if="!isdetail" class="action_btn">
+        <div v-if="!isdetail" class="action_btn">
-					<template>
+          <template>
             <span style="display: inline-block;">
               <el-button type="text" @click="addNew()" icon="el-icon-plus">添加</el-button>
             </span>
           </template>
-				</div>
+        </div>
-				<base-table
+        <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
-					:table-props="tableProps"
+          :table-data="checkDetList">
-					:page="listQuery.pageNo"
+          <method-btn v-if="!isdetail" slot="handleBtn" :width="120" label="操作" :method-list="tableBtn"
-					:limit="listQuery.pageSize"
+            @clickBtn="handleClick" />
-					:table-data="checkDetList">
+        </base-table>
-					<method-btn
+        <pagination v-show="listQuery.total > 0" :total="listQuery.total" :page.sync="listQuery.pageNo"
-						v-if="!isdetail"
+          :limit.sync="listQuery.pageSize" :page-sizes="[5, 10, 15]" @pagination="getList" />
-						slot="handleBtn"
-						:width="120"
-						label="操作"
-						:method-list="tableBtn"
-						@clickBtn="handleClick" />
-				</base-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 class="drawer-body__footer">
+        <!-- <div class="drawer-body__footer">
 					<el-button type="primary" @click="goback()">关闭</el-button>
 				</div> -->
-			</div>
+      </div>
 
-		</div>
+    </div>
 
-		<attr-add
+    <attr-add v-if="addOrUpdateVisible" ref="addOrUpdate" :order-id="dataForm.id" @refreshDataList="getList" />
-			v-if="addOrUpdateVisible"
+  </el-drawer>
-			ref="addOrUpdate"
-			:order-id="dataForm.id"
-			@refreshDataList="getList" />
-	</el-drawer>
 </template>
 
 <script>
@@ -111,8 +87,13 @@ const tableProps = [
 	},
 	{
 		prop: 'program',
-		label: '检查项目',
+    label: '巡检项目',
-	}
+  },
+  {
+    prop: 'checkResult',
+    label: '巡检结果',
+  },
+
 ];
 
 export default {

src/views/equipment/base/inspection/Settings/add.vue

@@ -201,7 +201,7 @@ export default {
 			this.groupOptions =
 				res1.data.map((item) => {
 					item.label =
-						item.name + ' - ' + getDictDataLabel('workshop', item.roomNameDict);
+            item.name + (getDictDataLabel('workshop', item.roomNameDict) ? ' - ' + getDictDataLabel('workshop', item.roomNameDict) : '')
 					return item;
 				}) || [];
 			// const res = await getEquipmentAll()

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

@@ -17,7 +17,7 @@
     <el-row :gutter="24">
       <el-col :span="24">
         <el-form-item label="默认巡检结果" prop="resultType">
-          <el-select v-model="dataForm.resultType" placeholder="请选择默认保养结果">
+          <el-select v-model="dataForm.resultType" placeholder="请选择默认保养结果" @change="handleClear">
             <el-option v-for="dict in resultList" :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
         </el-form-item>
@@ -38,13 +38,16 @@
       </el-col>
     </el-row>
     <el-row v-else-if="dataForm.resultType === 2" :gutter="24">
-      <el-col :span="12">
+      <el-col :span="11">
         <el-form-item prop="minValue">
           <el-input oninput="value=value.replace(/[^\-\d.]/g, '')" v-model="dataForm.minValue" placeholder="请输入最小值" />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="4">
-        <el-form-item prop="maxValue">
+        —————
+      </el-col>
+      <el-col :span="9">
+        <el-form-item prop="maxValue" label-width="20">
           <el-input @change="handleChange" oninput="value=value.replace(/[^\-\d.]/g, '')" v-model="dataForm.maxValue"
             placeholder="请输入最大值" />
         </el-form-item>
@@ -113,7 +116,12 @@ export default {
 		this.getDict()
 		console.log('我看看', this.dataForm)
 	},
-	methods: {
+  methods: {
+    handleClear() {
+      this.dataForm.minValue = undefined
+      this.dataForm.maxValue = undefined
+      this.dataForm.maintainResult = undefined
+    },
 		async getDict() {
 			// 物料列表
       const res = await getList();

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

@@ -29,9 +29,9 @@ export default {
   },
   created() {
   },
-  mounted() {
+  // mounted() {
-    this.getDataList()
+  //   this.getDataList()
-  },
+  // },
   methods: {
     // 获取数据列表
     getDataList() {

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

@@ -28,7 +28,6 @@ import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { deleteProgramTypeData } from '@/api/equipment/base/maintain/items'
 import showDetail  from './showDetail.vue'
-import { publicFormatter } from '@/utils/dict';
 
 export default {
   name: 'PlanConfig',
@@ -40,7 +39,7 @@ export default {
 		const t = new Date();
 		const [y, m, d] = [t.getFullYear(), t.getMonth(), t.getDate()];
 		return {
-      searchBarKeys: ['equipmentName', 'createTime'],
+      searchBarKeys: ['equipmentTypeId'],
       equipmentTypeList:[],
 			tableBtn: [
 				{
@@ -125,7 +124,7 @@ export default {
   created() {
     this.initSearchBar()
 		this.getList();
-	},
+  },
 	methods: {
 		/** 查询列表 */
 		getList() {
@@ -231,13 +230,14 @@ export default {
 					return;
 				}
         // 添加的提交
-				this.post(this.form).then((response) => {
+        this.post(this.form).then((res) => {
+          console.log('res', res)
 					this.$modal.msgSuccess('新增成功');
 					this.open = false;
           this.getList()
           this.showDetailVisible = true
           this.$nextTick(() => {
-            this.$refs.showDetail.init(this.form.equipmentTypeId)
+            this.$refs.showDetail.init(res.data)
           })
 				});
 			});

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

@@ -36,7 +36,7 @@ const tableProps = [
     align:'center',
   },
   {
-    prop: 'maintainResult',
+    prop: 'checkResult',
     label: '默认巡检结果',
     align: 'center',
   },
@@ -100,9 +100,11 @@ export default {
       // console.log(this.tableData)
     },
     getDataList(id) {
+      console.log(id)
       this.dataListLoading = true;
       this.queryParams.equipmentTypeId = id
-      this.urlOptions.getDataListURL(this.listQuery).then(response => {
+      console.log(this.queryParams.equipmentTypeId)
+      this.urlOptions.getDataListURL(this.queryParams).then(response => {
         this.tableData = response.data.list;
         this.listQuery.total = response.data.total;
         this.dataListLoading = false

src/views/equipment/base/maintain/Confirm/WaitingList--add--unplanned.vue

@@ -6,55 +6,32 @@
 -->
 
 <template>
-	<el-form
+  <el-form ref="form" :model="form" :size="size" :label-position="labelPosition" v-loading="formLoading">
-		ref="form"
+    <el-row :gutter="20">
-		:model="form"
+      <el-col :span="12">
-		:size="size"
+        <el-form-item label="设备保养单号" prop="maintainOrderNumber" :rules="[
-		:label-position="labelPosition"
-		v-loading="formLoading">
-		<el-row :gutter="20">
-			<el-col :span="12">
-				<el-form-item
-					label="设备保养单号"
-					prop="maintainOrderNumber"
-					:rules="[
 						{ required: true, message: '请输入设备保养单号', trigger: 'blur' },
 					]">
-					<el-input
+          <el-input v-model="form.maintainOrderNumber" @change="$emit('update', form)" :placeholder="`请输入保养计划单号`"
-						v-model="form.maintainOrderNumber"
+            :disabled="disabled" />
-						@change="$emit('update', form)"
+        </el-form-item>
-						:placeholder="`请输入保养计划单号`"
+      </el-col>
-						:disabled="disabled" />
-				</el-form-item>
-			</el-col>
 
-			<el-col :span="12">
+      <el-col :span="12">
-				<el-form-item label="保养计划名称" prop="name">
+        <el-form-item label="保养计划名称" prop="name">
-					<el-input value="---" disabled />
+          <el-input value="---" disabled />
-				</el-form-item>
+        </el-form-item>
-			</el-col>
+      </el-col>
 
-			<el-col :span="12">
+      <el-col :span="12">
-				<el-form-item
+        <el-form-item label="部门" prop="departmentId" :rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
-					label="部门"
+          <el-select v-model="form.departmentId" :placeholder="`请选择部门`" :disabled="disabled" clearable filterable
-					prop="departmentId"
+            @change="$emit('update', form)">
-					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
+            <el-option v-for="opt in departmentOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
-					<el-select
+          </el-select>
-						v-model="form.departmentId"
+        </el-form-item>
-						:placeholder="`请选择部门`"
-						:disabled="disabled"
-						clearable
-						filterable
-						@change="$emit('update', form)">
-						<el-option
-							v-for="opt in departmentOptions"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
 
-				<!-- <el-form-item
+        <!-- <el-form-item
 					label="设备大类"
 					prop="equipmentCategory"
 					:rules="[
@@ -72,89 +49,59 @@
 							:value="opt.value" />
 					</el-select>
 				</el-form-item> -->
-			</el-col>
+      </el-col>
 
-			<el-col :span="12">
+      <el-col :span="12">
-				<el-form-item
+        <el-form-item label="产线" prop="lineId" :rules="[{ required: true, message: '请选择产线', trigger: 'blur' }]">
-					label="产线"
+          <el-select v-model="form.lineId" :placeholder="`请选择产线`" :disabled="disabled" clearable filterable
-					prop="lineId"
+            @change="$emit('update', form)">
-					:rules="[{ required: true, message: '请选择产线', trigger: 'blur' }]">
+            <el-option v-for="opt in lineOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
-					<el-select
+          </el-select>
-						v-model="form.lineId"
+        </el-form-item>
-						:placeholder="`请选择产线`"
+      </el-col>
-						:disabled="disabled"
-						clearable
-						filterable
-						@change="$emit('update', form)">
-						<el-option
-							v-for="opt in lineOptions"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
 
-			<el-col :span="12">
+      <el-col :span="12">
-				<el-form-item label="计划保养人员" prop="maintainer">
+        <el-form-item label="计划保养人员" prop="maintainer">
-					<el-input value="---" disabled />
+          <el-input value="---" disabled />
-				</el-form-item>
+        </el-form-item>
-			</el-col>
+      </el-col>
 
-			<el-col :span="12">
+      <el-col :span="12">
-				<el-form-item label="计划开始时间" prop="planStartTime">
+        <el-form-item label="计划开始时间" prop="planStartTime">
-					<el-input value="---" disabled />
+          <el-input value="---" disabled />
-				</el-form-item>
+        </el-form-item>
-			</el-col>
+      </el-col>
 
-			<el-col :span="12">
+      <el-col :span="12">
-				<el-form-item label="计划结束时间" prop="planEndTime">
+        <el-form-item label="计划结束时间" prop="planEndTime">
-					<el-input value="---" disabled />
+          <el-input value="---" disabled />
-				</el-form-item>
+        </el-form-item>
-			</el-col>
+      </el-col>
 
-			<el-col :span="12">
+      <el-col :span="12">
-				<el-form-item
+        <el-form-item label="实际开始时间" prop="startTime" :rules="[
-					label="实际开始时间"
-					prop="startTime"
-					:rules="[
 						{ required: true, message: '请选择实际开始时间', trigger: 'blur' },
 					]">
-					<el-date-picker
+          <el-date-picker v-model="form.startTime" type="datetime" :disabled="edit" placeholder="请选择实际开始时间"
-						v-model="form.startTime"
+            @change="$emit('update', form)" value-format="timestamp"></el-date-picker>
-						type="datetime"
+        </el-form-item>
-						:disabled="edit"
+      </el-col>
-						placeholder="请选择实际开始时间"
-						@change="$emit('update', form)"
-						value-format="timestamp"></el-date-picker>
-				</el-form-item>
-			</el-col>
 
-			<el-col :span="12">
+      <el-col :span="12">
-				<el-form-item
+        <el-form-item label="实际结束时间" prop="endTime" :rules="[
-					label="实际结束时间"
-					prop="endTime"
-					:rules="[
 						{ required: true, message: '请选择实际结束时间', trigger: 'blur' },
 					]">
-					<el-date-picker
+          <el-date-picker v-model="form.endTime" type="datetime" :disabled="edit" placeholder="请选择实际结束时间"
-						v-model="form.endTime"
+            @change="$emit('update', form)" value-format="timestamp"></el-date-picker>
-						type="datetime"
+        </el-form-item>
-						:disabled="edit"
+      </el-col>
-						placeholder="请选择实际结束时间"
-						@change="$emit('update', form)"
-						value-format="timestamp"></el-date-picker>
-				</el-form-item>
-			</el-col>
 
-			<el-col :span="12">
+      <el-col :span="12">
-				<el-form-item
+        <el-form-item label="实际保养人员" prop="maintainWorker" :rules="[
-					label="实际保养人员"
+          { required: false, message: '请输入实际保养人员', trigger: 'blur' },
-					prop="maintainWorker"
-					:rules="[
-						{ required: false, message: '请选择实际保养人员', trigger: 'blur' },
 					]">
-					<el-select
+          <el-input v-model="form.maintainWorker" @change="$emit('update', form)" :placeholder="`请输入实际保养人员`" :disabled="disabled" />
+          <!-- <el-select
 						v-model="form.maintainWorker"
 						:placeholder="`请选择实际保养人员`"
 						:disabled="disabled"
@@ -167,21 +114,17 @@
 							:key="opt.value"
 							:label="opt.label"
 							:value="opt.value" />
-					</el-select>
+					</el-select> -->
-				</el-form-item>
+        </el-form-item>
-			</el-col>
+      </el-col>
 
-			<el-col :span="24">
+      <el-col :span="24">
-				<el-form-item label="备注" prop="remark">
+        <el-form-item label="备注" prop="remark">
-					<el-input
+          <el-input v-model="form.remark" @change="$emit('update', form)" :placeholder="`请输入备注`" :disabled="disabled" />
-						v-model="form.remark"
+        </el-form-item>
-						@change="$emit('update', form)"
+      </el-col>
-						:placeholder="`请输入备注`"
+    </el-row>
-						:disabled="disabled" />
+  </el-form>
-				</el-form-item>
-			</el-col>
-		</el-row>
-	</el-form>
 </template>
 
 <script>
@@ -321,7 +264,6 @@ export default {
 			const urls = [
 				'/base/core-production-line/listAll',
 				'/system/dept/list-all-simple',
-				'/base/core-worker/listAll',
 			];
 			let res;
 			switch (source) {
@@ -329,10 +271,6 @@ export default {
 					res = await this.$axios(urls[1]);
 					this.departmentList = res.data || [];
 					break;
-				case 'maintainer':
-					res = await this.$axios(urls[2]);
-					this.maintainerList = res.data || [];
-					break;
 				case 'line':
 					res = await this.$axios(urls[0]);
 					this.lineList = res.data || [];

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

@@ -6,177 +6,116 @@
 -->
 
 <template>
-	<el-drawer
+  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="true" class="drawer"
-		:visible.sync="visible"
+    custom-class="mes-drawer" size="60%" :before-close="beforeClose" @closed="$emit('destroy')">
-		:show-close="false"
+    <SmallTitle slot="title">编辑</SmallTitle>
-		:wrapper-closable="true"
-		class="drawer"
-		custom-class="mes-drawer"
-		size="60%"
-		:before-close="beforeClose"
-		@closed="$emit('destroy')">
-		<SmallTitle slot="title">编辑</SmallTitle>
 
-		<div class="drawer-body flex">
+    <div class="drawer-body flex">
-			<div class="drawer-body__content">
+      <div class="drawer-body__content">
-				<div class="form-part" style="margin-bottom: 32px">
+        <div class="form-part" style="margin-bottom: 32px">
-					<!-- <el-skeleton v-if="!showForm" animated /> -->
+          <!-- <el-skeleton v-if="!showForm" animated /> -->
-					<el-form
+          <el-form class="equipment-info-form" ref="form" :model="form" label-width="200px" label-position="top"
-						class="equipment-info-form"
+            v-loading="formLoading">
-						ref="form"
+            <el-row :gutter="20">
-						:model="form"
+              <el-col :span="8">
-						label-width="200px"
+                <el-form-item label="保养计划单号" prop="maintainOrderNumber">
-						label-position="top"
+                  <!-- :rules="[
-						v-loading="formLoading">
-						<el-row :gutter="20">
-							<el-col :span="8">
-								<el-form-item label="保养计划单号" prop="maintainOrderNumber">
-									<!-- :rules="[
 										{
 											required: true,
 											message: '请输入保养计划单号',
 											trigger: 'blur',
 										},
 									]" -->
-									<el-input
+                  <el-input v-model="form.maintainOrderNumber" disabled :placeholder="`请输入保养计划单号`" />
-										v-model="form.maintainOrderNumber"
+                </el-form-item>
-										disabled
+              </el-col>
-										:placeholder="`请输入保养计划单号`" />
-								</el-form-item>
-							</el-col>
 
-							<el-col :span="8">
+              <el-col :span="8">
-								<el-form-item label="保养计划名称" prop="planName">
+                <el-form-item label="保养计划名称" prop="planName">
-									<el-input
+                  <el-input v-model="form.planName" placeholder="请输入保养计划名称" disabled />
-										v-model="form.planName"
+                </el-form-item>
-										placeholder="请输入保养计划名称"
+              </el-col>
-										disabled />
-								</el-form-item>
-							</el-col>
 
-							<el-col :span="8">
+              <el-col :span="8">
-								<el-form-item label="部门" prop="departmentId">
+                <el-form-item label="部门" prop="departmentId">
-									<!-- :rules="[
+                  <!-- :rules="[
 										{ required: true, message: '请选择部门', trigger: 'blur' },
 									]" -->
-									<el-select
+                  <el-select v-model="form.departmentId" :placeholder="`请选择部门`" clearable disabled filterable>
-										v-model="form.departmentId"
+                    <el-option v-for="opt in departmentOptions" :key="opt.value" :label="opt.label"
-										:placeholder="`请选择部门`"
+                      :value="opt.value" />
-										clearable
+                  </el-select>
-										disabled
+                </el-form-item>
-										filterable>
+              </el-col>
-										<el-option
-											v-for="opt in departmentOptions"
-											:key="opt.value"
-											:label="opt.label"
-											:value="opt.value" />
-									</el-select>
-								</el-form-item>
-							</el-col>
 
-							<el-col :span="8">
+              <el-col :span="8">
-								<el-form-item label="产线" prop="lineId">
+                <el-form-item label="产线" prop="lineId">
-									<!-- :rules="[
+                  <!-- :rules="[
 										{ required: true, message: '请选择产线', trigger: 'blur' },
 									]" -->
-									<el-select
+                  <el-select v-model="form.lineId" :placeholder="`请选择产线`" disabled clearable filterable>
-										v-model="form.lineId"
+                    <el-option v-for="opt in lineOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
-										:placeholder="`请选择产线`"
+                  </el-select>
-										disabled
+                </el-form-item>
-										clearable
+              </el-col>
-										filterable>
-										<el-option
-											v-for="opt in lineOptions"
-											:key="opt.value"
-											:label="opt.label"
-											:value="opt.value" />
-									</el-select>
-								</el-form-item>
-							</el-col>
 
-							<el-col :span="8">
+              <el-col :span="8">
-								<el-form-item label="计划保养人员" prop="maintainer">
+                <el-form-item label="计划保养人员" prop="maintainer">
-									<el-select
+                  <el-select v-model="form.planMaintainWorker" placeholder="请选择计划保养人员" disabled clearable filterable />
-										v-model="form.planMaintainWorker"
+                </el-form-item>
-										placeholder="请选择计划保养人员"
+              </el-col>
-										disabled
-										clearable
-										filterable />
-								</el-form-item>
-							</el-col>
 
-							<el-col :span="8">
+              <el-col :span="8">
-								<el-form-item label="计划开始时间" prop="planStartTime">
+                <el-form-item label="计划开始时间" prop="planStartTime">
-									<el-date-picker
+                  <el-date-picker v-model="form.planStartTime" type="datetime" disabled placeholder="请选择计划开始时间"
-										v-model="form.planStartTime"
+                    value-format="timestamp"></el-date-picker>
-										type="datetime"
+                </el-form-item>
-										disabled
+              </el-col>
-										placeholder="请选择计划开始时间"
-										value-format="timestamp"></el-date-picker>
-								</el-form-item>
-							</el-col>
 
-							<el-col :span="8">
+              <el-col :span="8">
-								<el-form-item label="计划结束时间" prop="planEndTime">
+                <el-form-item label="计划结束时间" prop="planEndTime">
-									<el-date-picker
+                  <el-date-picker v-model="form.planEndTime" type="datetime" disabled placeholder="请选择计划结束时间"
-										v-model="form.planEndTime"
+                    value-format="timestamp"></el-date-picker>
-										type="datetime"
+                </el-form-item>
-										disabled
+              </el-col>
-										placeholder="请选择计划结束时间"
-										value-format="timestamp"></el-date-picker>
-								</el-form-item>
-							</el-col>
 
-							<el-col :span="8">
+              <el-col :span="8">
-								<el-form-item
+                <el-form-item label="实际开始时间" prop="startTime" :rules="[
-									label="实际开始时间"
-									prop="startTime"
-									:rules="[
 										{
 											required: true,
 											message: '请选择实际开始时间',
 											trigger: 'blur',
 										},
 									]">
-									<el-date-picker
+                  <el-date-picker v-model="form.startTime" type="datetime" placeholder="请选择实际开始时间"
-										v-model="form.startTime"
+                    value-format="timestamp"></el-date-picker>
-										type="datetime"
+                </el-form-item>
-										placeholder="请选择实际开始时间"
+              </el-col>
-										value-format="timestamp"></el-date-picker>
-								</el-form-item>
-							</el-col>
 
-							<el-col :span="8">
+              <el-col :span="8">
-								<el-form-item
+                <el-form-item label="实际结束时间" prop="endTime" :rules="[
-									label="实际结束时间"
-									prop="endTime"
-									:rules="[
 										{
 											required: true,
 											message: '请选择实际结束时间',
 											trigger: 'blur',
 										},
 									]">
-									<el-date-picker
+                  <el-date-picker v-model="form.endTime" type="datetime" placeholder="请选择实际结束时间"
-										v-model="form.endTime"
+                    value-format="timestamp"></el-date-picker>
-										type="datetime"
+                </el-form-item>
-										placeholder="请选择实际结束时间"
+              </el-col>
-										value-format="timestamp"></el-date-picker>
-								</el-form-item>
-							</el-col>
 
-							<el-col :span="8">
+              <el-col :span="8">
-								<el-form-item
+                <el-form-item label="实际保养人员" prop="maintainWorker" :rules="[
-									label="实际保养人员"
-									prop="maintainWorker"
-									:rules="[
 										{
 											required: false,
-											message: '请选择实际保养人员',
+                      message: '请输入实际保养人员',
 											trigger: 'blur',
 										},
 									]">
-									<el-select
+                  <el-input v-model="form.maintainWorker" :placeholder="`请输入实际保养人员`" />
+
+                  <!-- <el-select
 										v-model="form.maintainWorker"
 										:placeholder="`请选择实际保养人员`"
 										multiple
@@ -187,89 +126,62 @@
 											:key="opt.value"
 											:label="opt.label"
 											:value="opt.value" />
-									</el-select>
+									</el-select> -->
-								</el-form-item>
+                </el-form-item>
-							</el-col>
+              </el-col>
 
-							<el-col :span="24">
+              <el-col :span="24">
-								<el-form-item label="备注" prop="remark">
+                <el-form-item label="备注" prop="remark">
-									<el-input v-model="form.remark" :placeholder="`请输入备注`" />
+                  <el-input v-model="form.remark" :placeholder="`请输入备注`" />
-								</el-form-item>
+                </el-form-item>
-							</el-col>
+              </el-col>
-						</el-row>
+            </el-row>
-					</el-form>
+          </el-form>
-				</div>
+        </div>
 
-				<SmallTitle>保养内容</SmallTitle>
+        <SmallTitle>保养内容</SmallTitle>
 
-				<div style="margin-top: 12px; position: relative">
+        <div style="margin-top: 12px; position: relative">
-					<SearchBar
+          <SearchBar :formConfigs="searchBarFormConfig" ref="attr-search-bar" @headBtnClick="handleSearchBarBtnClick" />
-						:formConfigs="searchBarFormConfig"
+        </div>
-						ref="attr-search-bar"
-						@headBtnClick="handleSearchBarBtnClick" />
-				</div>
 
-				<div style="margin-top: 12px; position: relative">
+        <div style="margin-top: 12px; position: relative">
-					<div style="position: absolute; top: -40px; right: 0">
+          <div style="position: absolute; top: -40px; right: 0">
-						<el-button @click="handleAddAttr" type="text">
+            <el-button @click="handleAddAttr" type="text">
-							<i class="el-icon-plus"></i>
+              <i class="el-icon-plus"></i>
-							添加属性
+              添加属性
-						</el-button>
+            </el-button>
-					</div>
+          </div>
-					<base-table
+          <base-table v-loading="attrListLoading" :table-props="attrTableProps" :page="attrQuery?.params.pageNo || 1"
-						v-loading="attrListLoading"
+            :limit="attrQuery?.params.pageSize || 10" :table-data="attrList" @emitFun="handleEmitFun">
-						:table-props="attrTableProps"
+            <method-btn slot="handleBtn" label="操作" :method-list="tableBtn" @clickBtn="handleTableBtnClick" />
-						:page="attrQuery?.params.pageNo || 1"
+          </base-table>
-						:limit="attrQuery?.params.pageSize || 10"
-						:table-data="attrList"
-						@emitFun="handleEmitFun">
-						<method-btn
-							slot="handleBtn"
-							label="操作"
-							:method-list="tableBtn"
-							@clickBtn="handleTableBtnClick" />
-					</base-table>
 
-					<!-- 分页组件 -->
+          <!-- 分页组件 -->
-					<pagination
+          <pagination v-show="attrTotal > 0" :total="attrTotal" :page.sync="attrQuery.params.pageNo"
-						v-show="attrTotal > 0"
+            :limit.sync="attrQuery.params.pageSize" @pagination="getAttrList" />
-						:total="attrTotal"
+        </div>
-						:page.sync="attrQuery.params.pageNo"
+      </div>
-						:limit.sync="attrQuery.params.pageSize"
-						@pagination="getAttrList" />
-				</div>
-			</div>
 
-			<div class="drawer-body__footer">
+      <div class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">取消</el-button>
+        <el-button style="" @click="handleCancel">取消</el-button>
-				<el-button type="primary" @click="handleConfirm">保存</el-button>
+        <el-button type="primary" @click="handleConfirm">保存</el-button>
-				<!-- sections的第二项必须是 属性列表  -->
+        <!-- sections的第二项必须是 属性列表  -->
-				<!-- <el-button
+        <!-- <el-button
 						v-if="sections[1].allowAdd"
 						type="primary"
 						@click="handleAddAttr">
 						添加属性
 					</el-button> -->
-			</div>
+      </div>
-		</div>
+    </div>
 
-		<!-- 属性对话框 -->
+    <!-- 属性对话框 -->
-		<base-dialog
+    <base-dialog :dialogTitle="attrTitle" :dialogVisible="attrFormVisible" width="35%" :append-to-body="true"
-			:dialogTitle="attrTitle"
+      custom-class="baseDialog" @close="closeAttrForm" @cancel="closeAttrForm" @confirm="submitAttrForm">
-			:dialogVisible="attrFormVisible"
+      <DialogForm v-if="attrFormVisible" ref="attrForm" v-model="attrForm" :rows="attrRows" />
-			width="35%"
+    </base-dialog>
-			:append-to-body="true"
+  </el-drawer>
-			custom-class="baseDialog"
-			@close="closeAttrForm"
-			@cancel="closeAttrForm"
-			@confirm="submitAttrForm">
-			<DialogForm
-				v-if="attrFormVisible"
-				ref="attrForm"
-				v-model="attrForm"
-				:rows="attrRows" />
-		</base-dialog>
-	</el-drawer>
 </template>
 
 <script>
@@ -541,7 +453,7 @@ export default {
 			const urls = [
 				'/base/core-production-line/listAll',
 				'system/dept/list-all-simple',
-				'/base/core-worker/listAll',
+				// '/base/core-worker/listAll',
 			];
 			let res;
 			switch (source) {
@@ -549,10 +461,10 @@ export default {
 					res = await this.$axios(urls[1]);
 					this.departmentList = res.data || [];
 					break;
-				case 'maintainer':
+				// case 'maintainer':
-					res = await this.$axios(urls[2]);
+				// 	res = await this.$axios(urls[2]);
-					this.maintainerList = res.data || [];
+				// 	this.maintainerList = res.data || [];
-					break;
+				// 	break;
 				case 'line':
 					res = await this.$axios(urls[0]);
 					this.lineList = res.data || [];

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

@@ -105,14 +105,16 @@
                   <el-form-item label="实际保养人员" prop="maintainWorker" :rules="[
                   	{
                   		required: false,
-                  		message: '请选择实际保养人员',
+                      message: '请输入实际保养人员',
                   		trigger: 'blur',
                   	},
                   ]">
-                    <el-select v-model="form.maintainWorker" :placeholder="`请选择实际保养人员`" multiple clearable filterable>
+                    <el-input v-model="form.maintainWorker" :placeholder="`请输入实际保养人员`" />
+
+                    <!-- <el-select v-model="form.maintainWorker" :placeholder="`请选择实际保养人员`" multiple clearable filterable>
                       <el-option v-for="opt in maintainerOptions" :key="opt.value" :label="opt.label"
                         :value="opt.value" />
-                    </el-select>
+                    </el-select> -->
                   </el-form-item>
                 </el-col>
 
@@ -390,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;
@@ -445,7 +449,7 @@ export default {
 						method: 'put',
 						data: {
 							...this.form,
-							maintainWorker: this.form.maintainWorker.join(','),
+              maintainWorker: this.form.maintainWorker ? this.form.maintainWorker.join(',') :null,
 							special: false,
 							relatePlan: 2
 						}
@@ -463,8 +467,8 @@ export default {
 					url: '/base/equipment-maintain-log/create',
 					method: 'post',
 					data: {
-						...this.form,
+            ...this.form,
-						maintainWorker: this.form.maintainWorker.join(','),
+            maintainWorker: this.form.maintainWorker ? this.form.maintainWorker.join(',') : null,
 						special: false,
 						relatePlan: 2,
 						confirmed: false,
@@ -536,7 +540,7 @@ export default {
 			const urls = [
 				'/base/core-production-line/listAll',
 				'/system/dept/list-all-simple',
-				'/base/core-worker/listAll',
+				// '/base/core-worker/listAll',
 			];
 			let res;
 			switch (source) {
@@ -544,10 +548,10 @@ export default {
 					res = await this.$axios(urls[1]);
 					this.departmentList = res.data || [];
 					break;
-				case 'maintainer':
+				// case 'maintainer':
-					res = await this.$axios(urls[2]);
+				// 	res = await this.$axios(urls[2]);
-					this.maintainerList = res.data || [];
+				// 	this.maintainerList = res.data || [];
-					break;
+				// 	break;
 				case 'line':
 					res = await this.$axios(urls[0]);
 					this.lineList = res.data || [];

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/Monitor/showDetail.vue

@@ -37,8 +37,8 @@
         </el-form>
         <div class="blue-title">保养内容</div>
         <base-table v-loading="dataListLoading" :table-props="tableProps" :table-data="tableData">
-          <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
+          <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
-            @clickBtn="handleClick" />
+            @clickBtn="handleClick" /> -->
         </base-table>
       </div>
     </el-drawer>

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

@@ -135,7 +135,7 @@ export default {
 				maintainDuration: undefined,
         remark: undefined,
 				firstMaintenanceTime: undefined,
-				maintainer: undefined
+				maintainer: null
 			},
 			menuOptions: [],
 			proLineList: [],
@@ -175,8 +175,8 @@ export default {
 			const resline = await getCorePLList();
 			this.proLineList = resline.data;
 			// 保养人员
-			const personres = await getWorkerList()
+			// const personres = await getWorkerList()
-      this.personList = personres.data || []
+      // this.personList = personres.data || []
 		},
 		getList() {
 			// 获取产品属性列表
@@ -259,7 +259,8 @@ export default {
         if (this.dataForm.id) {
           this.urlOptions.updateURL({
 						...this.dataForm,
-						maintainer: this.dataForm.maintainer.join(',')
+            maintainer: this.dataForm.maintainer ? this.dataForm.maintainer.join(',') : null,
+
 					}).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.visible = false;
@@ -270,7 +271,7 @@ export default {
         // 添加的提交
         this.urlOptions.createURL({
 					...this.dataForm,
-					maintainer: this.dataForm.maintainer.join(',')
+          maintainer: this.dataForm.maintainer ? this.dataForm.maintainer.join(',') : null,
 				}).then(response => {
           this.$modal.msgSuccess("新增成功");
 					// this.idAttrShow = true

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

@@ -17,7 +17,7 @@
     <el-row :gutter="24">
       <el-col :span="24">
         <el-form-item label="默认保养结果" prop="resultType">
-          <el-select v-model="dataForm.resultType" placeholder="请选择默认保养结果">
+          <el-select v-model="dataForm.resultType" placeholder="请选择默认保养结果" @change="handleClear">
             <el-option v-for="dict in resultList" :key="dict.id" :label="dict.name" :value="dict.id" />
           </el-select>
         </el-form-item>
@@ -39,13 +39,16 @@
       </el-col>
     </el-row>
     <el-row v-else-if="dataForm.resultType === 2" :gutter="24">
-      <el-col :span="12">
+      <el-col :span="11">
         <el-form-item prop="minValue">
           <el-input oninput="value=value.replace(/[^\-\d.]/g, '')" v-model="dataForm.minValue" placeholder="请输入最小值" />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="4">
-        <el-form-item prop="maxValue">
+       —————
+      </el-col>
+      <el-col :span="9">
+        <el-form-item prop="maxValue" label-width="20">
           <el-input @change="handleChange" oninput="value=value.replace(/[^\-\d.]/g, '')" v-model="dataForm.maxValue"
             placeholder="请输入最大值" />
         </el-form-item>
@@ -67,6 +70,12 @@ import { getList,} from "@/api/base/qualityScrapType";
 
 export default {
 	mixins: [basicAdd],
+
+  props: {
+    mainId: {
+      type: String,
+    },
+  },
 	data() {
 		return {
 			urlOptions: {
@@ -93,7 +102,7 @@ export default {
         id: undefined,
         program: undefined,
         resultType: undefined,
-        equipmentTypeId: undefined,
+        mainId:this.mainId,
         minValue: undefined,
         maxValue: undefined,
         maintainResult:undefined,
@@ -102,7 +111,9 @@ export default {
 			dataRule: {
 				// materialId: [{ required: true, message: "", trigger: "blur" }],
         program: [{ required: true, message: "保养项目不能为空", trigger: "blur" }],
-        maintainResult: [{ required: true, message: "默认保养结果不能为空", trigger: "blur" }],
+        maintainResult: [{ required: true, message: "文本或数值不能为空不能为空", trigger: "blur" }],
+        resultType: [{ required: true, message: "默认保养结果不能为空", trigger: "blur" }],
+
         minValue: [{ required: true, message: "最小值不能为空", trigger: "blur" }],
         maxValue: [{ required: true, message: "最大值不能为空", trigger: "blur" }],
 
@@ -112,9 +123,13 @@ export default {
 	},
 	mounted() {
 		this.getDict()
-		console.log('我看看', this.dataForm)
 	},
-	methods: {
+  methods: {
+    handleClear() {
+      this.dataForm.minValue = undefined
+      this.dataForm.maxValue = undefined
+      this.dataForm.maintainResult = undefined
+    },
 		async getDict() {
 			// 物料列表
       const res = await getList();

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

@@ -223,15 +223,13 @@ export default {
 	},
 	methods: {
 		initSearchBar() {
-			this.http('/base/core-equipment/page', 'get', {
+      this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
-				special: false,
+        console.log('data', data);
-				pageNo: 1,
+
-				pageSize: 999,
-			}).then(({ data }) => {
 				this.$set(
 					this.searchBarFormConfig[0],
 					'selectOptions',
-					(data?.list || []).map((item) => ({
+					(data || []).map((item) => ({
 						name: item.name,
 						id: item.id,
 					}))

src/views/equipment/base/spareParts/Config/index.vue

@@ -184,16 +184,17 @@ export default {
 				],
 				[
 					{
-						select: true, // TODO: or INPUT instead of SELECT
+            input: true, // TODO: or INPUT instead of SELECT
 						label: '负责人',
 						prop: 'responsible',
-						url: '/base/core-worker/listAll', // TODO: 班组
+            // url: 'system/user/page', // TODO: 班组
-						valueKey: 'name',
+            // valueKey: 'id',
-						bind: {
+            // labelKey:'username',
-							filterable: true,
+						// bind: {
-							clearable: true,
+						// 	filterable: true,
-							multiple: true
+						// 	clearable: true,
-						},
+						// 	multiple: true
+						// },
 					},
 				],
 				[
@@ -288,7 +289,7 @@ export default {
 			const id = row.id;
 			this.info({ id }).then((response) => {
 				this.form = response.data;
-				this.form.responsible = this.form.responsible ? this.form.responsible.split(',') : undefined
+				// this.form.responsible = this.form.responsible ? this.form.responsible.split(',') : undefined
 				this.open = true;
 				this.title = '修改备品备件配置';
 			});
@@ -299,7 +300,7 @@ export default {
 				if (!valid) {
 					return;
 				}
-				this.form.responsible = this.form.responsible.join(',')
+				// this.form.responsible = this.form.responsible.join(',')/
 				// 修改的提交
 				if (this.form.id != null) {
 					this.put(this.form).then((response) => {

src/views/equipment/base/spareParts/List/index.vue

@@ -37,12 +37,14 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
-			<DialogForm
+			<DialogFormZ
 				v-if="open"
 				ref="form"
 				v-model="form"
+				label-position="top"
 				:disabled="mode == 'detail'"
 				:has-files="false"
+				@selectupdate="updateDialogFormZ"
 				:rows="rows" />
 		</base-dialog>
 	</div>
@@ -51,14 +53,16 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import DialogFormZ from '../../../DialogFormZ.vue';
 import { publicFormatter } from '@/utils/dict';
 import { deleteSparePart } from '@/api/equipment/base/spare-parts/list';
+import { getMaterialTree, getMaterialList } from '@/api/base/material';
 
 const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 export default {
 	name: 'EquipmentSparePartsList',
-	components: {},
+	components: { DialogFormZ },
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -129,33 +133,45 @@ export default {
 			rows: [
 				[
 					{
-						input: true,
+						select: true,
 						label: '备件名称',
-						prop: 'name',
+            prop: 'productMaterialId',
+            // url: '/base/core-product-material/listAll', // TODO: 供应商
+						options: [],
+						bind: {
+							filterable: true,
+							clearable: false,
+						},
 						rules: [
-							{ required: true, message: '备件名称不能为空', trigger: 'blur' },
+							{
+								required: true,
+								message: '备件名称不能为空',
+								trigger: 'change',
+							},
 						],
 					},
-					{
-						input: true,
-						label: '备件编码',
-						prop: 'code',
-						url: '/base/equipment-spare-part/getCode',
-						rules: [
-							{ required: true, message: '备件编码不能为空', trigger: 'blur' },
-						],
-					},
-				],
-				[
 					{
 						input: true,
 						label: '备件型号',
 						prop: 'model',
 					},
+				],
+				[
+					{
+						input: true,
+						label: '备件编码',
+						prop: 'code',
+						bind: {
+							disabled: true,
+						},
+					},
 					{
 						input: true,
 						label: '规格',
 						prop: 'specifications',
+						bind: {
+							disabled: true,
+						},
 					},
 				],
 				[
@@ -165,27 +181,32 @@ export default {
 						prop: 'supplierId',
 						url: '/base/core-supplier/listAll', // TODO: 供应商
 						bind: {
-							filterable: true,
+							disabled: true,
-							clearable: true,
 						},
-						rules: [
-							{ required: true, message: '供应商不能为空', trigger: 'blur' },
-						],
 					},
 					{
 						select: true,
-						label: '物料类型',
+						label: '单位',
-						prop: 'type',
+						prop: 'unit', // 数据字典
-						options: this.getDictDatas('material_type'),
-						// url: '/base/core-equipment/listAll', // TODO: 物料
 						bind: {
-							filterable: true,
+							disabled: true,
-							clearable: true,
 						},
-						rules: [
+						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
-							{ required: true, message: '物料类型不能为空', trigger: 'blur' },
-						],
 					},
+					// {
+					// 	select: true,
+					// 	label: '物料类型',
+					// 	prop: 'type',
+					// 	options: this.getDictDatas('material_type'),
+					// 	// url: '/base/core-equipment/listAll', // TODO: 物料
+					// 	bind: {
+					// 		filterable: true,
+					// 		clearable: true,
+					// 	},
+					// 	rules: [
+					// 		{ required: true, message: '物料类型不能为空', trigger: 'blur' },
+					// 	],
+					// },
 				],
 				[
 					{
@@ -201,14 +222,6 @@ export default {
 							},
 						],
 					},
-					{
-						select: true,
-						label: '单位',
-						prop: 'unit', // 数据字典
-						options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
-					},
-				],
-				[
 					{
 						input: true,
 						label: '备注',
@@ -225,11 +238,23 @@ export default {
 				name: null,
 			},
 			// 表单参数
-			form: {},
+			form: {
+				id: null,
+				code: null,
+				name: null,
+				model: null,
+				specifications: null,
+				life: null,
+				type: null,
+				supplierId: null,
+				unit: null,
+				remark: null,
+      },
 			basePath: '/base/equipment-spare-part',
 			mode: null,
 		};
 	},
+	mounted() {},
 	created() {
 		// this.initSearchBar();
 		this.getList();
@@ -267,8 +292,8 @@ export default {
 		reset() {
 			this.form = {
 				id: null,
+        productMaterialId: null,
 				code: null,
-				name: null,
 				model: null,
 				specifications: null,
 				life: null,
@@ -294,6 +319,7 @@ export default {
 			this.reset();
 			this.open = true;
 			this.title = '添加备品备件';
+			this.getDict();
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -302,13 +328,14 @@ export default {
 			this.info({ id }).then((response) => {
 				this.form = response.data;
 				if (this.form.unit !== undefined) {
-					this.form.unit = String(this.form.unit)
+					this.form.unit = String(this.form.unit);
 				}
 				if (this.form.type !== undefined) {
-					this.form.type = String(this.form.type)
+					this.form.type = String(this.form.type);
 				}
 				this.open = true;
 				this.title = '修改备品备件';
+				this.getDict();
 			});
 		},
 		/** 提交按钮 */
@@ -355,6 +382,7 @@ export default {
 				this.form = response.data;
 				this.open = true;
 				this.title = '修改备品备件';
+				this.getDict();
 			});
 		},
 		/** 导出按钮操作 */
@@ -375,6 +403,30 @@ export default {
 				})
 				.catch(() => {});
 		},
+		async getDict() {
+			// const materRes = await getMaterialTree();
+			// let typeId = materRes.data.find((item) => item.product === 2);
+			// const listQuery = {
+			// 	typeId: typeId,
+			// };
+			const materData = await getMaterialList();
+      this.rows[0][0].options = (materData.data || []).filter(item => item.typeId === 3)
+        .map(item => ({ label: item.name, value: item.id,...item }))
+      console.log(this.rows[0][0].options);
+
+		},
+    updateDialogFormZ(val) {
+      // console.log(this.rows[0][0].options)
+			const selectData = this.rows[0][0].options.find(
+				(item) => item.id === val.productMaterialId
+			);
+			this.form.productMaterialId = selectData.id;
+			this.form.name = selectData.name;
+			this.form.code = selectData.code;
+			this.form.specifications = selectData.specifications;
+			this.form.supplierId = selectData.supplierId;
+			this.form.unit = selectData.unit;
+		},
 	},
 };
 </script>

src/views/equipment/timing-diagram/status/chart.js

@@ -61,9 +61,9 @@ function getTodayStart(today) {
 
 /** 颜色配置 */
 const types = [
-    { name: '运行', color: '#288AFF' },
+     { name: '运行', color: '#288AFF' },
-    { name: '故障', color: '#FC9C91' },
     { name: '计划停机', color: '#FFDC94' },
+    { name: '故障', color: '#FC9C91' },
     { name: '空白', color: '#F2F4F9' },
 ];
 
@@ -86,7 +86,7 @@ export default class GanttGraph {
                         <span class="eq-name" style="margin-left: 4px;">${params.seriesName}</span>
                     </div>
                     <span class="run-status" style="margin-left: 8px; opacity: 0.6">${params.name}</span>
-            </div>            
+            </div>
             `
         }
     }
@@ -251,7 +251,7 @@ export default class GanttGraph {
                     y: 0,
                 },
                 data: arr.map(item => ({
-                    name: ['运行', '故障', '计划停机'][item.status],
+                    name: ['运行', '计划停机', '故障'][item.status],
                     value: [0, item.startTime, item.startTime + item.duration * 60 * 1000, 0],
                     itemStyle: {
                         color: types[item.status].color,
@@ -325,4 +325,4 @@ export default class GanttGraph {
         console.log(JSON.stringify(this.option, null, 2));
     }
 
-}
+}

src/views/equipment/timing-diagram/status/index.vue

@@ -6,29 +6,19 @@
 -->
 
 <template>
-	<div
+  <div class="status-timegraph-container" style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
-		class="status-timegraph-container"
+    <el-row class="" style="
-		style="background: #f2f4f9; flex: 1; display: flex; flex-direction: column">
-		<el-row
-			class=""
-			style="
 				margin-bottom: 12px;
 				background: #fff;
 				padding: 16px 16px 0;
 				border-radius: 8px;
 			">
-			<div class="blue-title">生产节拍时序图</div>
+      <div class="blue-title">生产节拍时序图</div>
-			<SearchBar
+      <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" :remove-blue="true"
-				:formConfigs="searchBarFormConfig"
+        @select-changed="handleSearchBarSelectChange" @headBtnClick="handleSearchBarBtnClick" />
-				ref="search-bar"
+    </el-row>
-				:remove-blue="true"
-				@select-changed="handleSearchBarSelectChange"
-				@headBtnClick="handleSearchBarBtnClick" />
-		</el-row>
 
-		<el-row
+    <el-row class="" style="
-			class=""
-			style="
 				height: 1px;
 				flex: 1;
 				margin-bottom: 12px;
@@ -38,60 +28,40 @@
 				display: flex;
 				flex-direction: column;
 			">
-			<el-row :gutter="20">
+      <el-row :gutter="20">
-				<el-col :span="6">
+        <el-col :span="6">
-					<div class="blue-title">设备状态时序图</div>
+          <div class="blue-title">设备状态时序图</div>
-				</el-col>
+        </el-col>
-				<el-col :span="18" class="legend-row">
+        <el-col :span="18" class="legend-row">
-					<div class="legend">
+          <div class="legend">
-						<div class="icon running"></div>
+            <div class="icon running"></div>
-						<div>运行中</div>
+            <div>运行中</div>
-					</div>
+          </div>
-					<div class="legend">
+          <div class="legend">
-						<div class="icon fault"></div>
+            <div class="icon stop"></div>
-						<div>故障</div>
+            <div>计划停机</div>
-					</div>
+          </div>
-					<div class="legend">
+          <div class="legend">
-						<div class="icon stop"></div>
+            <div class="icon fault"></div>
-						<div>计划停机</div>
+            <div>故障</div>
-					</div>
+          </div>
-				</el-col>
+        </el-col>
-			</el-row>
+      </el-row>
-			<div
+      <div class="main-area" style="flex: 1; display: flex; flex-direction: column">
-				class="main-area"
+        <div class="graphs" v-show="graphList.length" id="status-chart" style="height: 1px; flex: 1"></div>
-				style="flex: 1; display: flex; flex-direction: column">
+        <h2 v-if="!graphList || graphList.length == 0" class="no-data-bg"></h2>
-				<div
+      </div>
-					class="graphs"
+    </el-row>
-					v-show="graphList.length"
-					id="status-chart"
-					style="height: 1px; flex: 1"></div>
-				<h2 v-if="!graphList || graphList.length == 0" class="no-data-bg"></h2>
-			</div>
-		</el-row>
 
-		<!-- 对话框(添加 / 修改) -->
+    <!-- 对话框(添加 / 修改) -->
-		<base-dialog
+    <base-dialog dialogTitle="添加设备" :dialogVisible="open" width="500px" @close="open = false" @cancel="open = false"
-			dialogTitle="添加设备"
+      @confirm="submitForm">
-			:dialogVisible="open"
+      <el-select v-if="open" style="width: 100%" filterable clearable v-model="queryParams.equipmentId"
-			width="500px"
+        placeholder="请选择一个设备">
-			@close="open = false"
+        <el-option v-for="eq in eqList" :key="eq.id" :value="eq.id" :label="eq.name"></el-option>
-			@cancel="open = false"
+      </el-select>
-			@confirm="submitForm">
+    </base-dialog>
-			<el-select
+  </div>
-				v-if="open"
-				style="width: 100%"
-				filterable
-				clearable
-				v-model="queryParams.equipmentId"
-				placeholder="请选择一个设备">
-				<el-option
-					v-for="eq in eqList"
-					:key="eq.id"
-					:value="eq.id"
-					:label="eq.name"></el-option>
-			</el-select>
-		</base-dialog>
-	</div>
 </template>
 
 <script>
@@ -103,12 +73,6 @@ export default {
 	components: {},
 	props: {},
 	data() {
-		const today = new Date();
-		const todayStart = new Date(
-			today.getFullYear(),
-			today.getMonth(),
-			today.getDate()
-		);
 		return {
 			chart: null,
 			searchBarFormConfig: [
@@ -138,7 +102,7 @@ export default {
 					placeholder: '选择日期',
 					param: 'recordTime',
 					required: true,
-					defaultSelect: moment(todayStart).format('YYYY-MM-DD HH:mm:ss'),
+					defaultSelect:null,
 				},
 				{
 					type: 'button',
@@ -191,14 +155,24 @@ export default {
 			// ],
 		};
 	},
-	computed: {},
+  computed: {},
-	created() {
+  created () {
-		this.initProductline();
+    this.initProductline();
-		this.initWorksection();
+    this.initWorksection();
-		this.initEquipment();
+    this.initEquipment();
+  },
+  mounted() {
+    const today = new Date();
+    const todayStart = new Date(
+      today.getFullYear(),
+      today.getMonth(),
+      today.getDate()
+    );
+    this.searchBarFormConfig[2].defaultSelect = moment(todayStart).format('YYYY-MM-DD HH:mm:ss')
+    console.log('111111', this.searchBarFormConfig[2].defaultSelect)
 		// this.getList();
 	},
-	mounted() {},
+	// mounted() {},
 	watch: {
 		graphList: {
 			handler(val) {
@@ -246,7 +220,7 @@ export default {
 			});
 		},
 
-		async getList() {
+    async getList() {
 			const { code, data } = await this.$axios({
 				url: '/monitoring/equipment-monitor/status-series',
 				method: 'get',
@@ -312,7 +286,7 @@ export default {
 			if (!value) {
 				this.searchBarFormConfig[1].selectOptions = [];
 				return;
-			}
+      }
 			switch (param) {
 				case 'lineId':
 					this.$axios({
@@ -322,7 +296,8 @@ export default {
 							id: value,
 						},
 					}).then(({ code, data }) => {
-						if (code == 0) {
+            if (code == 0) {
+              this.searchBarFormConfig[2].defaultSelect = null
 							this.searchBarFormConfig[1].selectOptions = data.map((item) => {
 								return {
 									name: item.name,

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
- * @LastEditors: zhp
+ * @LastEditors: zwq
- * @LastEditTime: 2023-11-28 10:34:24
+ * @LastEditTime: 2024-10-15 15:59:48
  * @Description:
 -->
 <template>
@@ -26,9 +26,11 @@ import { parseTime } from '../../core/mixins/code-filter';
 import {
   getProcessTraceabilityPage,
   getWorkOrderList,
-  getCoreProduct
   // exportEnergyPlcExcel
 } from '@/api/quality/processTraceability';
+import {
+	getProductMaterial,
+} from '@/api/base/material';
 import { publicFormatter } from '@/utils/dict';
 const tableProps = [
   {
@@ -62,6 +64,14 @@ const tableProps = [
     prop: 'actualQuantity',
     label: '生产数量'
   },
+  {
+    prop: 'lineName',
+    label: '产线名称'
+  },
+  {
+    prop: 'lineNum',
+    label: '产线预计产量'
+  },
   {
     prop: 'planProductUnit',
     label: '单位',
@@ -187,7 +197,7 @@ export default {
       if (val.type === "processDetail") {
         console.log(val);
         let specificationsData =''
-        getCoreProduct(val.data.planProductId).then((res) => {
+        getProductMaterial(val.data.planProductId).then((res) => {
           console.log(res)
 
           this.$router.push({
@@ -199,6 +209,7 @@ export default {
               specifications: res.data.specifications,
               productName: val.data.planProductName,
               processFlowName: val.data.processFlowName,
+              lineId: val.data.lineId,
               // planProductId: val.data.planProductId
               // equipmentName,
             },

src/views/extend/processTraceabilityDetail/components/ProcessBomList.vue

@@ -185,6 +185,7 @@ export default {
         pageNo: 1,
         pageSize: 10,
         orderId: this.$route.query.orderId,
+        lineId: this.$route.query.lineId,
         flowDetId: [this.detId],
         // orderId: this.$route.query.orderId,
 
@@ -232,6 +233,7 @@ export default {
           pageNo: 1,
           pageSize: 10,
           orderId: this.$route.query.orderId,
+          lineId: this.$route.query.lineId,
           flowDetId: [this.detId],
           // orderId: this.$route.query.orderId,
 
@@ -263,6 +265,7 @@ export default {
         pageNo: 1,
         pageSize: 10,
         orderId: this.$route.query.orderId,
+        lineId: this.$route.query.lineId,
         flowDetId: [this.detId],
       }).then((res) => {
         console.log(res);

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>
@@ -277,7 +288,7 @@ export default {
 			if (
 				moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')
 			) {
-				num = Number(moment().format('DD'));
+				num = Number(moment().format('DD'))-1;
 			} else {
 				num = 0;
 			}

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,8 +176,10 @@ 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('，'):'-'
-            }
+            }else{
+							item.str = '-'
+						}
           });
 					this.list = res.data.list;
 					this.total = res.data.total;

src/views/group/base/schedulingRuleConfig/components/schedulingRuleConfigAdd.vue

@@ -125,13 +125,15 @@ export default {
 			addButtonShow: '',
 			planArr: [], //排班计划数组
 			rules: {
-				name: [{ required: true, message: '请输入班组名称', trigger: 'blur' }],
 				startDay: [
 					{ required: true, message: '请选择排班开始时间', trigger: 'change' },
 				],
 				endDay: [
 					{ required: true, message: '请选择排班结束时间', trigger: 'change' },
 				],
+				planId:[
+					{ required: true, message: '请选择排班计划', trigger: 'change' },
+				]
 			},
 		};
 	},
@@ -231,6 +233,10 @@ export default {
 							};
 							list.push(obj);
 						});
+						if (list.length === 0) {
+							this.$modal.msgError('班组上班顺序不能为空');
+							return false;
+						}
 						this.form.list = list;
 						updateGroupRule({ ...this.form }).then((res) => {
 							this.$modal.msgSuccess('操作成功');
@@ -246,6 +252,10 @@ export default {
 							};
 							list.push(obj);
 						});
+						if (list.length === 0) {
+							this.$modal.msgError('班组上班顺序不能为空');
+							return false;
+						}
 						this.form.list = list;
 						createGroupRule({ ...this.form }).then((res) => {
 							this.$modal.msgSuccess('操作成功');
@@ -268,13 +278,8 @@ export default {
 	margin-bottom: 5px;
 }
 .min-title::before {
-	content: '';
+	content: "*";
-	display: inline-block;
+	color: #ff5454;
-	vertical-align: middle;
+	margin-right: 4px;
-	width: 6px;
-	height: 6px;
-	border-radius: 50%;
-	margin: auto 5px;
-	background-color: #0b58ff;
 }
 </style>

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

@@ -44,7 +44,9 @@ import {
 	deleteGroupRule,
 	updateGroupRule,
 	getGroupRule,
+	disableGroupRule
 } from '@/api/base/groupSchedulingRule';
+import { groupClassesListAll } from '@/api/monitoring/teamProduction';
 import schedulingRuleConfigAdd from './components/schedulingRuleConfigAdd.vue';
 import { formatDate } from '@/utils';
 import tableHeightMixin from '@/mixins/tableHeightMixin';
@@ -76,11 +78,13 @@ export default {
 	data() {
 		return {
 			formConfig: [
-				{
+			{
-					type: 'input',
+					type: 'select',
 					label: '班次',
-					placeholder: '班次',
+					selectOptions: [],
-					param: 'name',
+					param: 'id',
+					defaultSelect: '',
+					filterable: true,
 				},
 				{
 					type: 'button',
@@ -154,19 +158,35 @@ export default {
 			queryParams: {
 				pageNo: 1,
 				pageSize: 20,
-				name: null,
+				id: null,
 			},
+			classNameList:[]
 		};
 	},
 	created() {
+		this.getClassNameList();
 		this.getList();
 	},
 	methods: {
+		getClassNameList() {
+		  groupClassesListAll().then((res) => {
+				this.formConfig[0].selectOptions = res.data;
+				this.classNameList = res.data;
+		  })
+		},
 		buttonClick(val) {
 			switch (val.btnName) {
 				case 'search':
 					this.queryParams.pageNo = 1;
-					this.queryParams.classesName = val.name || undefined;
+					if (val.id) {
+						this.classNameList.map((item) => {
+							if (val.id === item.id) {
+								this.queryParams.classesName = item.name
+							}
+						})
+					}else{
+						this.queryParams.classesName = ''
+					}
 					this.getList();
 					break;
 				default:
@@ -186,7 +206,7 @@ export default {
 							formatDate(item.startDay) +
 							'至' +
 							(item.endDay ? formatDate(item.endDay) : '永久');
-						item.str = item.strList.join(',');
+						item.str = item.strList.join('，');
 					});
 					this.list = res.data.list;
 					this.total = res.data.total;
@@ -231,14 +251,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/groupTeamView/components/groupTeamViewDetail.vue

@@ -13,6 +13,8 @@
           </el-col>
         </el-row>
         <base-table
+          :page="1"
+          :limit="5000"
           :table-props="tableProps"
           :table-data="tableData"
           :max-height="tableH"
@@ -43,7 +45,7 @@ const tableProps = [
   },
   {
     prop: 'workTime',
-    label: '工作时长'
+    label: '工作时长(h)'
   }
 ]
 export default {

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

@@ -62,7 +62,8 @@ export default {
           selectOptions: [],
           param: 'workOrderId',
           clearable: false,
-          filterable: true
+          filterable: true,
+          required: true
         },
         {
           type: 'button',

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"
       />
@@ -38,6 +38,7 @@ import { groupTeamSchedulingPage, groupClassesListAll } from '@/api/monitoring/t
 import { parseTime } from '@/utils/ruoyi'
 import TeamProductionDetail from './components/teamProductionDetail'
 import tableHeightMixin from '@/mixins/tableHeightMixin';
+import moment from 'moment'
 const tableProps = [
   {
     prop: 'createTime',
@@ -53,14 +54,12 @@ const tableProps = [
   {
     prop: 'startTime',
     label: '上班时间',
-    filter: parseTime,
+    filter: (val) => moment(val).format('HH:mm')
-    minWidth: 160
   },
   {
     prop: 'endTime',
     label: '下班时间',
-    filter: parseTime,
+    filter: (val) => moment(val).format('HH:mm')
-    minWidth: 160
   },
   {
     prop: 'classesName',
@@ -70,7 +69,8 @@ const tableProps = [
   {
     prop: 'teamName',
     label: '班组名称',
-    showOverflowtooltip: true
+    showOverflowtooltip: true,
+    minWidth: 100
   }
 ]
 export default {
@@ -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/home/index.vue

@@ -407,7 +407,7 @@ export default {
 			}
 		}
 		.current-date {
-			font-size: 10px;
+			font-size: 15px;
 			font-weight: 500;
 			position: absolute;
 			right: 0px;

src/views/mall/promotion/couponTemplate/index.vue

@@ -176,7 +176,6 @@ import {
 } from "@/utils/constants";
 import { getSpuSimpleList } from "@/api/mall/product/spu";
 import { parseTime } from "@/utils/ruoyi";
-import {changeRoleStatus} from "@/api/system/role";
 
 export default {
   name: "PromotionCouponTemplate",

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/materialProductBom/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-08-14 15:26:32
+ * @LastEditTime: 2024-10-14 09:26:29
  * @Description:
 -->
 <template>
@@ -252,10 +252,8 @@ export default {
 			});
 		},
 		async getDict() {
-			const materRes = await getMaterialTree();
+			const materRes = await getMaterialTree();//
-			let typeId = materRes.data[0].product
+      let typeId = materRes.data.find(item=>item.product === 1).id
-				? materRes.data[0].id
-				: materRes.data[1].id;
 			const listQuery = {
 				typeId: typeId,
 			};

src/views/material/materialProductBom/attr-add.vue

@@ -117,8 +117,8 @@ export default {
 	methods: {
 		async getDict() {
 			// 物料列表
-			const materRes = await getMaterialTree();
+			const materRes = await getMaterialTree(); //
-      let typeId = materRes.data[0].product?materRes.data[1].id:materRes.data[0].id
+      let typeId = materRes.data.find(item=>item.product === 1).id
       const listQuery= {
         typeId:typeId
       }

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-08-14 15:27:50
+ * @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: [],
@@ -207,16 +208,18 @@ export default {
 	},
 	methods: {
 		async getDictData() {
-			const materRes = await getMaterialTree();
+			const materRes = await getMaterialTree(); //
-      let typeId = materRes.data[0].product?materRes.data[1].id:materRes.data[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/monitoring/equipmentFullParams/index.vue

@@ -1,4 +1,4 @@
-<!-- 
+<!--
     filename: index.vue
     author: liubin
     date: 2023-08-31 09:14:19
@@ -44,16 +44,17 @@ import { Message } from 'element-ui';
 import LocalDataManager from './utils/local-data-manager';
 // import response from './response';
 import moment from 'moment';
+import { parseTime } from '@/utils/ruoyi'
 
 export default {
 	name: 'EquipmentFullParams',
 	components: {},
 	props: {},
 	data() {
-		const now = new Date();
+		// const now = new Date().getTime();
-		const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
+		// const [y, m, d] = [now.getFullYear(), now.getMonth(), now.getDate()];
-		const today = new Date(y, m, d, 0, 0, 0, 0).getTime();
+		const today = new Date().getTime();
-		const aWeekAgo = today - 3600 * 1000 * 24 * 7;
+		const tenminAgo = new Date(today - (10 * 60 * 1000)).getTime();
 		return {
 			searchBarFormConfig: [
 				{
@@ -73,10 +74,10 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间段',
-					dateType: 'daterange', // datetimerange
+					dateType: 'datetimerange', // datetimerange
 					format: 'yyyy-MM-dd HH:mm:ss',
 					// valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'timestamp',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
@@ -90,17 +91,29 @@ export default {
 					btnName: '查询',
 					name: 'search',
 					color: 'primary',
-				},
+        },
+        {
+          type: 'button',
+          btnName: '返回',
+          name: 'return',
+          color: 'primary',
+        },
 			],
 			queryParams: {
-				id: null,
+				equipmentId: null,
-				time: [new Date(aWeekAgo), new Date(today)],
+				recordTime: [parseTime(tenminAgo), parseTime(today)],
 			},
 			tableList: [
 				// {
 				// 	key: 'base-table__key__1',
-				// 	tableProps: [],
+				// 	tableProps: [{
-				// 	list: [],
+				// 		prop: 'name',
+				// 		label: 'name'
+				// 	}],
+				// 	dataManager: {dataList: [{name: '1'}]},
+				// 	list: [{
+				// 		name: '11'
+				// 	}],
 				// 	pageNo: 1,
 				// 	pageSize: 3,
 				// 	total: 0,
@@ -111,7 +124,7 @@ export default {
 	beforeRouteEnter(to, from, next) {
 		if (Object.keys(to.params).length > 0) {
 			next((vm) => {
-				vm.$set(vm.queryParams, 'id', to.params.equipmentId);
+				vm.$set(vm.queryParams, 'equipmentId', to.params.equipmentId);
 				vm.$set(
 					vm.searchBarFormConfig[0],
 					'defaultSelect',
@@ -122,6 +135,11 @@ export default {
 					'defaultSelect',
 					to.params.equipmentCode
 				);
+				vm.$set(
+					vm.searchBarFormConfig[2],
+					'defaultSelect',
+					vm.queryParams.recordTime
+				);
 				vm.handleQuery();
 			});
 		} else {
@@ -155,7 +173,7 @@ export default {
 	},
 	beforeRouteLeave(to, from, next) {
 		// clean job
-		this.$set(this.queryParams, 'id', null);
+		this.$set(this.queryParams, 'equipmentId', null);
 		this.$set(this.searchBarFormConfig[0], 'defaultSelect', null);
 		this.$set(this.searchBarFormConfig[1], 'defaultSelect', null);
 		this.tableList = [];
@@ -192,7 +210,7 @@ export default {
 				props.push({
 					label: item.name,
 					prop: item.name,
-					width: 128,
+					// width: 128,
 				});
 				firstLineData[item.name] = `${item.minValue ?? ''}-${
 					item.maxValue ?? ''
@@ -266,13 +284,25 @@ export default {
 			);
 		},
 
-		async handleSearchBarBtnClick({ btnName, timeVal }) {
+    async handleSearchBarBtnClick({ btnName, timeVal }) {
-			if (timeVal && timeVal.length > 0) {
+      console.log(btnName);
-				this.queryParams.time = timeVal;
+      if (btnName === 'search') {
-			} else {
+        if (timeVal && timeVal.length > 0) {
-				this.queryParams.time = [];
+          console.log('nihc ', timeVal)
-			}
+          if (new Date(timeVal[1]).getTime() - new Date(timeVal[0]).getTime() <= 30 * 60 * 1000) {
-			await this.handleQuery();
+            this.queryParams.recordTime = timeVal;
+            await this.handleQuery();
+          } else {
+            this.$message.warning('时间范围最大30分钟限制！')
+          }
+        } else {
+          this.queryParams.recordTime = [];
+          this.$message.warning('时间段必选！')
+        }
+      } else {
+        this.$router.go(-1)
+      }
+
 		},
 
 		handleEmitFun(table, val) {
@@ -295,9 +325,12 @@ export default {
 }
 
 .tables {
-	display: grid;
+	/* display: grid; */
-	grid-template-columns: 1fr 1fr;
+	/* grid-template-columns: 1fr 1fr; */
-	gap: 18px;
+	/* gap: 18px; */
+	display: flex;
+	flex-direction: column;
+	width: 100%;
 }
 
 .tables >>> .baseTable {
@@ -306,5 +339,6 @@ export default {
 
 .custom-table {
 	overflow-x: hidden;
+	margin-bottom: 10px;
 }
 </style>

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

@@ -1,304 +0,0 @@
-<template>
-  <el-form ref="addWorkOrder" :rules="rules" label-width="130px" :model="form" label-position='top'>
-    <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="工单名称" prop="name" v-if='!isBind'>
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-        <el-form-item label="工单名称" prop="workOrderId"  v-if='isBind'>
-          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" filterable @change="getWorkOrderMsg">
-            <el-option
-              v-for="item in workOrderList"
-              :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="code">
-          <el-input v-model="form.code" disabled></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="产品名称" prop="planProductId">
-          <el-select v-model="form.planProductId" placeholder="请选择" disabled  style="width: 100%;">
-            <el-option
-              v-for="item in productList"
-              :key="item.id"
-              :label="item.name+' | '+item.specifications"
-              :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="计划开始时间">
-          <el-date-picker
-            v-model="planStartTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 100%;"
-            placeholder="选择日期"
-            :disabled="isBind">
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="计划完成时间">
-          <el-date-picker
-            v-model="planFinishTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            style="width: 100%;"
-            placeholder="选择日期"
-            :disabled="isBind">
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="计划投入数量" prop="planAssignQuantity">
-          <el-input-number v-model="form.planAssignQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="计划生产数量" prop="planQuantity">
-          <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" :disabled="isBind" 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-row>
-    <el-row :gutter="20">
-      <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 v-model="form.priority" placeholder="请选择" style="width: 100%;" :disabled="isBind">
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="工单类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" :disabled="isBind">
-            <el-option
-              v-for="item in workOrderTypeList"
-              :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="productLineId">
-          <el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind">
-            <el-option
-              v-for="item in productLineList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="负责人" prop="workers">
-          <el-input v-model="form.workers" :disabled="isBind"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <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 { getProcessFlowList, getWorkOrderCode, orderIssue, workOrderList, getWorkOrderById } from '@/api/base/orderManage'
-import { getLineAll } from '@/api/base/productionLine'
-import moment from 'moment'
-export default {
-  name: 'AddWorkOrder',
-  data() {
-    return {
-      form: {
-        workOrderId: '',
-        orderId: '',
-        name: '',
-        code: '',
-        planProductId: '',
-        planStartTime: '',
-        planFinishTime: '',
-        planAssignQuantity: 0,
-        planQuantity: 0,
-        processFlowId: '',
-        materialMethod: 1,
-        priority: '',
-        productLineId: [],
-        type: '',
-        workers: '',
-        planAssignmentQuantity: ''
-      },
-      rules: {
-        name: [{ required: true, message: "工单名称不能为空", trigger: "blur" }],
-        planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
-        planAssignQuantity: [{ required: true, message: "计划投入数量不能为空", trigger: "blur" }],
-        planQuantity: [{ required: true, message: "计划生产数量不能为空", trigger: "blur" }],
-        productLineId: [{ required: true, message: "产线不能为空", trigger: "change" }],
-        planAssignmentQuantity: [{ required: true, message: "计划分配订单量不能为空", trigger: "blur" }]
-      },
-      productList: [],
-      processFlowList: [],
-      productLineList: [],
-      workOrderTypeList: [
-        {id: 1,name:'标准工单'},
-        {id: 2, name:'特殊工单'}
-      ],
-      planStartTime: '',
-      planFinishTime: '',
-      isBind: false,
-      workOrderList: []
-    }
-  },
-  methods: {
-    init(data, param) {
-      this.form.orderId = data.id
-      this.getList()
-      if (param === 'add') {
-        this.isBind = false
-        getWorkOrderCode().then(res => {
-          this.form.code = res.data || ''
-        })
-        this.form.planProductId = data.planProductId
-        this.form.processFlowId = data.processFlowId
-        this.form.materialMethod = data.materialMethod
-      }else{//绑定
-        this.isBind = true
-      }
-    },
-    getList() {
-      // 产品
-      getProductAll().then(res => {
-        this.productList = res.data || []
-      })
-      // 产线
-      getLineAll().then(res => {
-        this.productLineList = res.data || []
-      })
-      // 工艺
-      getProcessFlowList().then(res => {
-        this.processFlowList = res.data || []
-      })
-      // 工单list
-      workOrderList({
-        status: 1
-      }).then(res => {
-        this.workOrderList = res.data || []
-      })
-    },
-    addWorkOrderSubmit() {
-      this.$refs['addWorkOrder'].validate((valid) => {
-        if (valid) {
-          if (this.isBind) {
-            //绑定工单
-            orderIssue({
-              workOrderId: this.form.workOrderId,
-              orderId: this.form.orderId,
-              planAssignmentQuantity: this.form.planAssignmentQuantity
-             }).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功")
-                this.$emit('addWorkOrderSubmit')
-              }
-            })
-          } else {
-            // 新增工单
-            let _this = this
-            _this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : ''
-            _this.form.planFinishTime = _this.planFinishTime ? new Date(_this.planFinishTime).valueOf() : ''
-            orderIssue({ ..._this.form }).then(res => {
-              if (res.code === 0) {
-                _this.$modal.msgSuccess("操作成功")
-                let name = this.form.name
-                _this.$emit('addWorkOrderSubmit')
-                // 询问是否添加预使用主原料
-                _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
-                    _this.$router.push({
-                      path: '/core/core-work-order?workOrderName='+encodeURI(name)
-                    })
-                  })
-              }
-            })
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    formClear() {
-      this.$refs.addWorkOrder.resetFields()
-      this.form.materialMethod = 1
-      this.form.planAssignQuantity = 0
-      this.form.planQuantity = 0
-      this.planFinishTime = ''
-      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.planProductId = res.data.planProductId
-            this.planStartTime = res.data.planStartTime ? moment.unix(res.data.planStartTime).format('YYYY-MM-DD HH:mm:ss') : null
-            this.planFinishTime = res.data.planFinishTime ? moment.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
-            this.form.workers = res.data.workers
-          }
-        })
-      }
-    }
-  }
-}
-</script>

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

@@ -1,293 +0,0 @@
-<template>
-  <el-form ref="orderAddForm" :rules="rules" label-width="130px" :model="form" label-position='top'>
-    <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="订单名称" prop="name">
-          <el-input v-model="form.name"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="订单号" prop="code">
-          <el-input v-model="form.code"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="计划加工数量" prop="planQuantity">
-          <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="产品名称" prop="planProductId">
-          <el-select 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">
-              <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-row>
-    <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="单价" prop="price">
-          <el-input-number v-model="form.price" :min="0" :max="9999999999999" :precision='2' style="width: 100%;"></el-input-number>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="客户" prop="customerId">
-          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable filterable>
-            <el-option
-              v-for="item in customerList"
-              :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="priority">
-          <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" clearable>
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="包装规格" prop="packSpec">
-          <el-select v-model="form.packSpec" placeholder="请选择" style="width: 100%;" clearable>
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.PACK_SPEC)"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="负责人" prop="workers">
-          <el-input v-model="form.workers"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span='6'>
-        <el-form-item label="关联工艺" prop="processFlowId">
-          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable filterable @change="processFlowIdChange">
-            <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%;" @change='materialMethodChange'>
-            <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="planStartTime">
-          <el-date-picker
-            v-model="form.planStartTime"
-            type="datetime"
-            style="width: 100%;"
-            value-format="timestamp"
-            @change="timeChange"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="订单计划完成时间" prop="planFinishTime">
-          <el-date-picker
-            v-model="form.planFinishTime"
-            type="datetime"
-            style="width: 100%;"
-            value-format="timestamp"
-            @change="timeChange"
-            placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col :span='12'>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <!-- <el-row>
-      <el-col :span='24'>
-        <el-form-item label="描述信息" prop="description">
-          <el-input v-model="form.description"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row> -->
-  </el-form>
-</template>
-<script>
-import { getOrderCode, getOrderById, getProcessFlowList, orderUpdate, orderCreate } from '@/api/base/orderManage'
-import { getProductAll } from '@/api/base/product'
-import { getCustomerList } from '@/api/base/customer'
-export default {
-  name: 'OrderAdd',
-  data() {
-    return {
-      form: {
-        id: '',
-        name: '',
-        code: '',
-        planQuantity: '',
-        planProductId: '',
-        price: '',
-        customerId: '',
-        priority: '',
-        packSpec: '',
-        workers: '',
-        processFlowId: '',
-        materialMethod: 1,
-        remark: '',
-        // description: '',
-        planStartTime: '',
-        planFinishTime: ''
-      },
-      rules: {
-        name: [{ required: true, message: "订单名称不能为空", trigger: "blur" }],
-        code: [{ required: true, message: "订单号不能为空", trigger: "blur" }],
-        planQuantity: [{ required: true, message: "计划加工数量不能为空", trigger: "blur" }],
-        planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }]
-      },
-      productList: [],
-      customerList: [],
-      processFlowList: [],
-      isEdit: false //是否是编辑
-    }
-  },
-  methods: {
-    init(id) {
-      this.getList()
-      if (id) {
-        this.isEdit = true
-        this.form.id = id
-        getOrderById({id: this.form.id}).then(res => {
-          if (res.code === 0) {
-            this.form.name = res.data.name
-            this.form.code = res.data.code
-            this.form.planQuantity = res.data.planQuantity
-            this.form.planProductId = res.data.planProductId
-            this.form.price = res.data.price
-            this.form.customerId = res.data.customerId
-            this.form.priority = res.data.priority ? res.data.priority + '' : ''
-            this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
-            this.form.packSpec = res.data.packSpec ? res.data.packSpec+'' : ''
-            this.form.workers = res.data.workers
-            this.form.processFlowId = res.data.processFlowId
-            this.form.materialMethod = res.data.materialMethod
-            this.form.planFinishTime = res.data.planFinishTime ? res.data.planFinishTime : null
-            this.form.remark = res.data.remark
-            // this.form.description = res.data.description
-          }
-        })
-      } else {
-        this.isEdit = false
-        this.form.id = ''
-        // 订单号
-        getOrderCode().then(res => {
-          this.form.code = res.data || ''
-        })
-      }
-    },
-    getList() {
-      // 产品
-      getProductAll().then(res => {
-        this.productList = res.data || []
-      })
-      // 客户
-      getCustomerList().then(res => {
-        this.customerList = res.data || []
-      })
-      // 工艺
-      getProcessFlowList().then(res => {
-        this.processFlowList = res.data || []
-      })
-    },
-    timeChange() {
-      if (this.form.planStartTime && this.form.planFinishTime) {
-        if (this.form.planStartTime > this.form.planFinishTime) {
-          this.$modal.msgError('计划开始时间不能大于结束时间')
-        }
-      }
-    },
-    // 工艺变更
-    materialMethodChange(val) {
-      if (val === 2 && !this.form.processFlowId) {
-        this.form.materialMethod = 1
-        this.$modal.msgError("请先选择关联工艺");
-      }
-    },
-    // 工艺变更
-    processFlowIdChange(val) {
-      console.log(val)
-      if (!val) {
-        this.form.materialMethod = 1
-      }
-    },
-    submitForm() {
-      this.$refs['orderAddForm'].validate((valid) => {
-        if (valid) {
-          if (this.form.planStartTime && this.form.planFinishTime) {
-            if (this.form.planStartTime > this.form.planFinishTime) {
-              this.$modal.msgError('计划开始时间不能大于结束时间')
-              return false
-            }
-          }
-          // console.log(this.form)
-          if (this.isEdit) {
-            //编辑
-            orderUpdate({ ...this.form }).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          } else {
-            this.form.status = 1
-            this.form.triggerOrigin = 1
-            orderCreate({ ...this.form }).then((res) => {
-              if (res.code === 0) {
-                this.$modal.msgSuccess("操作成功");
-                this.$emit('successSubmit')
-              }
-            })
-          }
-        } else {
-          return false
-        }
-      })
-    },
-    formClear() {
-      this.$refs.orderAddForm.resetFields()
-      this.form.materialMethod = 1
-      this.form.price = 0.00
-      this.form.planQuantity = 0
-      this.isEdit = false
-    }
-  }
-}
-</script>

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

@@ -1,470 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
-    <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :max-height="tableH"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="240"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
-    </base-table>
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
-    <!-- 新增&编辑 -->
-    <base-dialog
-      :dialogTitle="addOrEditTitle"
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-      width='60%'
-    >
-      <order-add ref="orderAdd" @successSubmit="successSubmit" />
-    </base-dialog>
-    <!-- 查看详情 -->
-    <!-- 新增工单 -->
-    <base-dialog
-      :dialogTitle="workIssueTitle"
-      :dialogVisible="addWorkOrdervisible"
-      @cancel="addWorkOrderCancel"
-      @confirm="addWorkOrderConfirm"
-      :before-close="addWorkOrderCancel"
-      width='70%'
-    >
-      <add-work-order ref="addWorkOrder" @addWorkOrderSubmit="addWorkOrderSubmit" />
-    </base-dialog>
-  </div>
-</template>
-<script>
-import { parseTime } from '@/utils/ruoyi'
-import { getOrderPage, orderDelete, customerList, orderFinish } from '@/api/base/orderManage'
-import OrderAdd from './components/orderAdd'
-import AddWorkOrder from './components/addWorkOrder'
-import { publicFormatter } from '@/utils/dict'
-const tableProps = [
-  {
-    prop: 'createTime',
-    label: '添加时间',
-    filter: parseTime,
-    minWidth: 160
-  },
-  {
-    prop: 'name',
-    label: '订单名称',
-    minWidth: 120,
-    showOverflowtooltip: true
-  },
-  {
-    prop: 'code',
-    label: '订单编码',
-    minWidth: 180
-  },
-  {
-    prop: 'customerId',
-    label: '客户',
-    showOverflowtooltip: true
-  },
-  {
-    prop: 'triggerOrigin',
-    label: '来源',
-    filter: publicFormatter('order_Origin')
-  },
-  {
-    prop: 'priority',
-    label: '优先级',
-    filter: publicFormatter('order_priority')
-  },
-  {
-    prop: 'status',
-    label: '订单状态',
-    filter: publicFormatter('order_status')
-  },
-  {
-    prop: 'planQuantity',
-    label: '计划加工量',
-    width: 100
-  },
-  {
-    prop: 'actualQuantity',
-    label: '实际加工量',
-    width: 100
-  },
-  {
-    prop: 'productName',
-    label: '产品',
-    showOverflowtooltip: true
-  },
-  {
-    prop: 'unit',
-    label: '单位',
-    filter: publicFormatter('unit_dict')
-  },
-  {
-    prop: 'price',
-    label: '单价(元)',
-    align: 'right'
-  },
-  {
-    prop: 'workOrderNum',
-    label: '工单数量'
-  }
-]
-export default {
-  name: 'OrderManage',
-  data() {
-    return {
-      formConfig: [
-        {
-          type: 'input',
-          label: '订单名称',
-          placeholder: '订单名称',
-          param: 'name'
-        },
-        {
-          type: 'select',
-          label: '状态',
-          selectOptions: this.getDictDatas(this.DICT_TYPE.ORDER_STATUS),
-          labelField: 'label',
-          valueField: 'value',
-          param: 'status'
-        },
-        {
-          type: 'datePicker',
-          label: '时间段',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultSelect: [],
-          width: 250
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        },
-        {
-          type: this.$auth.hasPermi('base:order-manage:create') ? 'separate' : '',
-        },
-        {
-          type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
-          btnName: '新增',
-          name: 'add',
-          color: 'success',
-          plain: true
-        }
-      ],
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 20,
-        name: null,
-        status: null,
-        lastIssuedTime: []
-      },
-      total: 0,
-      tableProps,
-      list: [],
-      tableH: this.tableHeight(260),
-      tableBtn: [
-      this.$auth.hasPermi('base:order-manage:addWorkOrder')
-          ? {
-              type: 'add',
-              btnName: '新增',
-              showTip: '新增工单',
-              showParam: {
-                type: '|',
-                data: [
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 1
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 2
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 3
-                  }
-                ]
-              }
-            }
-          : undefined,
-      this.$auth.hasPermi('base:order-manage:bindWorkOrder')
-          ? {
-              type: 'bind',
-              btnName: '绑定',
-              showTip: '绑定工单',
-              showParam: {
-                type: '|',
-                data: [
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 1
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 2
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 3
-                  }
-                ]
-              }
-            }
-          : undefined,
-      this.$auth.hasPermi('base:order-manage:bindWorkOrder')
-          ? {
-              type: 'complete',
-              btnName: '完成',
-              showTip: '完成订单',
-              showParam: {
-                type: '|',
-                data: [
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 2
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 3
-                  }
-                ]
-              }
-            }
-          : undefined,
-      this.$auth.hasPermi('base:order-manage:detail')
-          ? {
-              type: 'detail',
-              btnName: '详情'
-            }
-          : undefined,
-        this.$auth.hasPermi('base:order-manage:edit')
-          ? {
-              type: 'edit',
-              btnName: '编辑',
-              showParam: {
-                type: '&',
-                data: [
-                  {
-                    type: 'equal',
-                    name: 'triggerOrigin',
-                    value: 1
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 1
-                  }
-                ]
-              }
-            }
-          : undefined,
-        this.$auth.hasPermi('base:order-manage:delete')
-          ? {
-              type: 'delete',
-              btnName: '删除',
-              showParam: {
-                type: '&',
-                data: [
-                  {
-                    type: 'equal',
-                    name: 'triggerOrigin',
-                    value: 1
-                  },
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 1
-                  }
-                ]
-              }
-            }
-          : undefined
-      ].filter((v) => v),
-      addOrEditTitle: '',
-      centervisible: false,
-      priorityList: this.getDictDatas(this.DICT_TYPE.ORDER_PRIORITY),
-      workIssueTitle: '',
-      addWorkOrdervisible: false,
-      orderDetailVisible: false
-    }
-  },
-  components: { OrderAdd, AddWorkOrder },
-  created() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
-    this.getList()
-  },
-  methods: {
-    getList() {
-      getOrderPage({...this.queryParams}).then(res => {
-        let arr = res.data.records || []
-        this.total = res.data.total || 0
-        if (arr.length > 0) {
-          customerList().then(result => {
-            let tempData = result.data || []
-            if (tempData.length > 0) {
-              arr.map(item => {
-                for (let i of tempData) {
-                  if (item.customerId === i.id) {
-                    item.customerId = i.name
-                  }
-                }
-                item.price = item.price.toFixed(2)
-              })
-              this.list = arr
-            }
-          })
-        }else {
-          this.list = arr
-        }
-      })
-    },
-    buttonClick(val) {
-      console.log(val)
-      if (val.btnName === 'search') {
-        this.queryParams.name = val.name
-        this.queryParams.status = val.status
-        if (val.timeVal && val.timeVal.length > 0) {
-          this.queryParams.lastIssuedTime[0] = val.timeVal[0] + ' 00:00:00'
-          this.queryParams.lastIssuedTime[1] = val.timeVal[1] + ' 23:59:59'
-        } else {
-          this.queryParams.lastIssuedTime = []
-        }
-        this.getList()
-      } else {
-        this.addOrEditTitle = '新增'
-        this.centervisible = true
-        this.$nextTick(() => {
-          this.$refs.orderAdd.init()
-        })
-      }
-    },
-    handleClick(val) {
-      console.log(val)
-      switch (val.type) {
-        case 'edit':
-          this.addOrEditTitle = '编辑'
-          this.centervisible = true
-          this.$nextTick(() => {
-            this.$refs.orderAdd.init(val.data.id)
-          })
-          break
-        case 'delete':
-          this.handleDelete(val.data)
-          break
-        case 'detail':
-          this.$router.push({path: '/order/base/order-manage/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 'bind':
-          this.workIssueTitle = '绑定工单'
-          this.addWorkOrdervisible = true
-          this.$nextTick(() => {
-            this.$refs.addWorkOrder.init(val.data, 'bind')
-          })
-          break
-        case 'complete':
-          this.handleComplete(val.data)
-          break
-        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.confirm('是否确认完成订单"' + val.name + '"?').then(function() {
-          return orderFinish({ id: val.id })
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("操作成功");
-        }).catch(() => {});
-    },
-    // 新增
-    handleCancel() {
-      this.$refs.orderAdd.formClear()
-      this.centervisible = false
-      this.addOrEditTitle = ''
-    },
-    handleConfirm() {
-      this.$refs.orderAdd.submitForm()
-    },
-    successSubmit() {
-      this.handleCancel()
-      this.getList()
-    },
-    // 下发新增
-    addWorkOrderCancel() {
-      this.$refs.addWorkOrder.formClear()
-      this.addWorkOrdervisible = false
-    },
-    addWorkOrderConfirm() {
-      this.$refs.addWorkOrder.addWorkOrderSubmit()
-    },
-    addWorkOrderSubmit() {
-      this.addWorkOrderCancel()
-      this.getList()
-    }
-    // bindWorkOrderCancel() {
-    //   this.$refs.bindWorkOrder.formClear()
-    //   this.bindWorkOrdervisible = false
-    // },
-    // bindWorkOrderConfirm() {
-    //   this.$refs.bindWorkOrder.bindWorkOrderSubmit()
-    // },
-    // bindWorkOrderSubmit() {
-    //   this.bindWorkOrderCancel()
-    //   this.getList()
-    // }
-  }
-}
-</script>

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

@@ -1,343 +0,0 @@
-<template>
-  <div class="orderDetailData">
-    <div class="box1">
-      <div class="boxTitle">
-        <span class="blueTitle"></span>
-        <span>订单编码: {{orderMsg.code}}</span>
-      </div>
-      <el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button>
-      <div style="padding-left: 14px;">
-        <el-row>
-          <el-col :span='3'>
-            <div class="blodTip">订单名</div>
-            <div class="lightTip">{{orderMsg.name}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">产品信息</div>
-            <div class="lightTip">{{orderMsg.productName}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">产品规格</div>
-            <div class="lightTip">{{orderMsg.specifications}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">客户</div>
-            <div class="lightTip">{{orderMsg.customerName}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">包装规格</div>
-            <div class="lightTip">{{ getDictDataLabel(DICT_TYPE.PACK_SPEC, orderMsg.packSpec)}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">物料计算方式</div>
-            <div class="lightTip">{{orderMsg.materialMethod ? (orderMsg.materialMethod === 1 ? '产品基础' : '工艺扩展') : ''}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">创建时间</div>
-            <div class="lightTip">{{ parseTime(orderMsg.createTime) }}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">计划开始时间</div>
-            <div class="lightTip">{{ parseTime(orderMsg.planStartTime) }}</div>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span='3'>
-            <div class="blodTip">计划完成时间</div>
-            <div class="lightTip">{{ parseTime(orderMsg.planFinishTime) }}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">计划加工数量</div>
-            <div class="lightTip">{{orderMsg.planQuantity}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">加工平方数(平方米)</div>
-            <div class="lightTip">{{orderMsg.planArea}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">预计用时(时)</div>
-            <div class="lightTip">{{ orderMsg.expectTime }}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">状态</div>
-            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderMsg.status)}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">实际开始时间</div>
-            <div class="lightTip">{{ parseTime(orderMsg.startProduceTime) }}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">实际完成时间</div>
-            <div class="lightTip">{{ parseTime(orderMsg.finishProduceTime) }}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">实际生产数量</div>
-            <div class="lightTip">{{orderMsg.actualQuantity	}}</div>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span='3'>
-            <div class="blodTip">完成比%</div>
-            <div class="lightTip">{{orderMsg.completeProp}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">废片数量</div>
-            <div class="lightTip">{{orderMsg.nokQuantity}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">负责人</div>
-            <div class="lightTip">{{orderMsg.workers}}</div>
-          </el-col>
-          <el-col :span='3'>
-            <div class="blodTip">关联工艺</div>
-            <div class="lightTip">{{processFlowName}}</div>
-          </el-col>
-        </el-row>
-      </div>
-    </div>
-    <div class="box2">
-      <div class="boxTitle">
-        <span class="blueTitle"></span>
-        <span>工单信息</span>
-      </div>
-      <!-- 列表 -->
-      <base-table
-        :page="queryParams.pageNo"
-        :limit="queryParams.pageSize"
-        :table-props="tableProps1"
-        :table-data="list1"
-        :max-height="tableH"
-      />
-    </div>
-    <div class="box3">
-      <div class="boxTitle">
-        <span class="blueTitle"></span>
-        <span>预计用料信息</span>
-      </div>
-      <!-- 列表 -->
-      <base-table
-        :page="queryParams.pageNo"
-        :limit="queryParams.pageSize"
-        :table-props="tableProps2"
-        :table-data="list2"
-        :max-height="tableH"
-      />
-    </div>
-  </div>
-</template>
-<script>
-import { parseTime } from '@/utils/ruoyi'
-import { publicFormatter } from '@/utils/dict'
-import { getProcessFlowList } from '@/api/base/orderManage'
-const tableProps1 = [
-  {
-    prop: 'issueTime',
-    label: '下发时间',
-    filter: parseTime,
-    minWidth: 160
-  },
-  {
-    prop: 'name',
-    label: '工单名',
-    minWidth: 100,
-    showOverflowtooltip: true
-  },
-  {
-    prop: 'code',
-    label: '工单编码',
-    minWidth: 150
-  },
-  {
-    prop: 'planAssignmentQuantity',
-    label: '计划加工量',
-    width: 100
-  },
-  {
-    prop: 'actualQuantity',
-    label: '实际加工量',
-    width: 100
-  },
-  {
-    prop: 'actualArea',
-    label: '加工平方数',
-    width: 100
-  },
-  {
-    prop: 'status',
-    label: '状态',
-    filter: publicFormatter('order_status')
-  },
-  {
-    prop: 'startProduceTime',
-    label: '开始时间',
-    filter: parseTime,
-    minWidth: 160
-  },
-  {
-    prop: 'finishProduceTime',
-    label: '结束时间',
-    filter: parseTime,
-    minWidth: 160
-  },
-  {
-    prop: 'productLineNames',
-    label: '关联产线',
-    filter: (val) => val ? val.join(',') : '',
-    showOverflowtooltip: true
-  },
-  {
-    prop: 'workers',
-    label: '负责人'
-  },
-  {
-    prop: 'remark',
-    label: '备注'
-  }
-]
-const tableProps2 = [
-  {
-    prop: 'materialName',
-    label: '物料名称'
-  },
-  {
-    prop: 'unit',
-    label: '单位',
-    filter: publicFormatter('unit_dict')
-  },
-  {
-    prop: 'num',
-    label: '剩余生产预计消耗'
-  }
-]
-import { orderDetail, bomUseNum } from '@/api/base/orderManage'
-export default {
-  name: 'OrderDetailData',
-  data() {
-    return {
-      orderId: '',
-      tableProps1,
-      tableProps2,
-      list1: [],
-      list2: [],
-      tableH: this.tableHeight(510) / 2,
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 500
-      },
-      orderMsg: {},
-      processFlowName: ''
-    }
-  },
-  mounted() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(510) / 2
-    })
-    this.orderId = location.href.split('?')[1].split('=')[1]
-    this.getMsg()
-  },
-  watch: {
-    $route: 'initData'
-  },
-  methods: {
-    initData(to) {
-      if (to.name === 'OrderDetailData') {
-        this.orderId = location.href.split('?')[1].split('=')[1]
-        this.getMsg()
-      }
-    },
-    getMsg() {
-      orderDetail({
-        id: this.orderId
-      }).then(res => {
-        this.orderMsg = res.data
-        this.list1 = res.data.coreWorkOrderRespVOS
-        bomUseNum({
-          productId: this.orderMsg.planProductId
-        }).then(res2 => {
-          if (res2.data && res2.data.length > 0) {
-            let arr = res2.data
-            arr.map(item => {
-              if (item) {
-                let a = item.num * this.orderMsg.remainingQuantity
-                item.num = !isNaN(parseFloat(a)) && isFinite(a) ? a : ''
-              }
-            })
-            this.list2 = arr
-          }else {
-            this.list2 = []
-          }
-        })
-        // 工艺
-        getProcessFlowList().then(res => {
-          let arr = res.data || []
-          if (arr.length > 0) {
-            arr.map(item => {
-              if (item.id === this.orderMsg.processFlowId) {
-                this.processFlowName = item.name
-              }
-            })
-          }
-        })
-      })
-    },
-    // 返回
-    returnOrderManage() {
-      this.$router.push({path: '/order/base/order-manage'})
-    }
-  }
-}
-</script>
-<style lang='scss' scoped>
-.orderDetailData {
-  background-color: rgb(242, 244, 249);
-  .box1, .box2, .box3 {
-    background-color: #fff;
-    border-radius: 9px;
-  }
-  .box2 {
-    height: calc((100vh - 360px) / 2);
-    padding: 12px 16px 0;
-    margin: 8px 0;
-  }
-  .box1 {
-    height: 215px;
-    padding: 16px 16px 0 16px;
-    .blodTip {
-      height: 16px;
-      font-size: 14px;
-      font-weight: 600;
-      color: rgba(0,0,0,0.85);
-      margin-bottom: 8px;
-    }
-    .lightTip {
-      height: 16px;
-      font-size: 14px;
-      font-weight: 400;
-      color: rgba(102,102,102,0.75);
-      margin-bottom: 12px;
-    }
-  }
-  .box3 {
-    padding: 16px;
-    height: calc((100vh - 360px) / 2);
-    }
-  .boxTitle {
-    display: inline-block;
-    font-size: 16px;
-    font-weight: 400;
-    color: #000000;
-    margin:0 10px 20px 0;
-  }
-  .blueTitle {
-    content: '';
-    display: inline-block;
-    width: 4px;
-    height: 18px;
-    background-color: #0B58FF;
-    border-radius: 1px;
-    margin-right: 8px;
-    vertical-align: bottom;
-  }
-}
-</style>

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

@@ -1,168 +0,0 @@
-<template>
-  <div>
-    <div class="boxTitle">
-      <span class="blueTitle"></span>
-      <span>各订单环形图</span>
-    </div>
-    <div class="chartBox" id='orderChartBox' v-show='chartList.length'>
-      <div class="chartItem" v-for="(item, index) in chartList" :key='index' :style="{width: 388*beilv+'px',height: 286*beilv+'px',padding:14*beilv+'px',marginRight:9*beilv+'px',marginBottom:9*beilv+'px'}">
-        <div class="topTitle" :style="{fontSize: 14 * beilv + 'px'}">
-          <svg-icon icon-class="order-monitoring" :style="{fontSize: 16*beilv+'px'}"/>
-          <span class="orderName" :style="{paddingRight:8*beilv+'px',marginRight:8*beilv+'px'}">{{item.orderName}}</span>
-          <span>订单计划数量{{item.num}}</span>
-        </div>
-        <div
-          :id="item.id"
-          :style="{width: 166*beilv+'px',height: 166*beilv+'px',margin: 'auto'}"
-        ></div>
-        <div class="legend" :style="{height: 54 * beilv + 'px', marginTop: 10*beilv+'px'}">
-          <div class="legendItem" v-for="(subItem, i) in item.workOrder" :key='i' :style="{paddingRight:9*beilv+'px',marginRight:9*beilv+'px'}">
-            <span class="itemNum" :style="{fontSize: 18 * beilv + 'px'}">{{subItem.value}}</span>
-            <div>
-              <span class="itemName" :style="{fontSize: 14 * beilv + 'px'}">
-                <span class="smallBlock" :style="{backgroundColor:subItem.color,width:8*beilv+'px',height:8*beilv+'px'}"></span>
-                {{subItem.name}}
-              </span>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <!-- 空图 -->
-    <div class="no-data-bg" v-show='!chartList.length'></div>
-  </div>
-</template>
-<script>
-import * as echarts from 'echarts'
-import { debounce } from '@/utils/debounce'
-export default {
-  name: 'MonitoringRingCharts',
-  props: {
-    chartList: {
-      type: Array,
-      default: () => {
-        return []
-      }
-    }
-  },
-  data() {
-    return {
-      myChart: [],
-      beilv: 1,
-      canvasReset: ''
-    }
-  },
-  mounted() {
-    this.beilv = document.getElementById('orderChartBox').offsetWidth / 1610
-    this.canvasReset = debounce(() => {
-      this.initChart()
-    }, 500)
-    window.addEventListener('resize', () => {
-      this.beilv = document.getElementById('orderChartBox').offsetWidth / 1610
-      this.canvasReset()
-    })
-  },
-  methods: {
-    // 饼图
-    initChart() {
-      if (this.chartList.length <= 0) {
-        return false
-      }
-      // 销毁实例
-      for (let j = 0;j < this.chartList.length; j++) {
-        if (this.myChart[j]) {
-          this.myChart[j].dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例
-        }
-      }
-      for (let i = 0; i < this.chartList.length; i++) {
-        var chartDom = document.getElementById(this.chartList[i].id);
-        this.myChart[i] = echarts.init(chartDom);
-        let colorList = []
-        this.chartList[i].workOrder.map(item => {
-          colorList.push(item.color)
-        })
-        let percentage = (this.chartList[i].sunNum/this.chartList[i].num*100).toFixed(0)
-        var option = {
-          color: colorList,
-          series: [
-            {
-              name: 'Access From',
-              type: 'pie',
-              radius: ['75%', '95%'],
-              avoidLabelOverlap: false,
-              itemStyle: {
-                borderRadius: 5,
-                borderColor: '#fff',
-                borderWidth: 2
-              },
-              label: {
-                show: true,
-                position: 'center',
-                color: '#000',
-                formatter: [
-                    '{a|'+percentage+'%}',
-                    '{b|生产'+this.chartList[i].sunNum+'}'
-                ].join('\n\n'),
-                rich: {
-                  a: {
-                      fontSize: this.beilv*24 +'px'
-                  },
-                  b: {
-                      fontSize: this.beilv*12 +'px'
-                  }
-                }
-              },
-              emphasis: {
-                disabled: true
-              },
-              labelLine: {
-                show: false
-              },
-              data: this.chartList[i].workOrder
-            }
-          ]
-        };
-        option && this.myChart[i].setOption(option)
-      }
-    }
-  }
-}
-</script>
-<style lang='scss' scoped>
-.chartBox {
-  width: 100%;
-  padding-right: 6px;
-  height: calc(100vh - 310px);
-  display: flex;
-  flex-flow: row wrap;
-  overflow: auto;
-  align-content: flex-start;
-  .chartItem {
-    border-radius: 8px;
-    border: 1px solid #CACACA;
-    .topTitle {
-      margin-bottom: 10px;
-      .orderName {
-        border-right: 1px solid #CACACA;
-      }
-    }
-    .legend {
-      text-align: center;
-      white-space: nowrap;
-      overflow: auto;
-      .legendItem {
-        display: inline-block;
-        border-right: 1px solid #E8E8E8;
-        .itemName {
-          .smallBlock {
-            display: inline-block;
-          }
-        }
-      }
-      .legendItem:last-child {
-        border: none;
-      }
-    }
-  }
-}
-</style>

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

@@ -1,371 +0,0 @@
-<template>
-  <div class="app-container orderMonitoring">
-    <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
-    <el-tabs v-model="activeName" @tab-click="toggleTab">
-      <el-tab-pane label="数据列表" name="dataList"></el-tab-pane>
-      <el-tab-pane label="环形图" name="barChart"></el-tab-pane>
-    </el-tabs>
-    <!-- 表 -->
-    <div v-if="activeName === 'dataList'">
-      <base-table
-        :page="queryParams.pageNo"
-        :limit="queryParams.pageSize"
-        :table-props="tableProps"
-        :table-data="list"
-        :max-height="tableH"
-      >
-        <method-btn
-          v-if="tableBtn.length"
-          slot="handleBtn"
-          :width="140"
-          label="操作"
-          :method-list="tableBtn"
-          @clickBtn="handleClick"
-        />
-      </base-table>
-      <pagination
-        :page.sync="queryParams.pageNo"
-        :limit.sync="queryParams.pageSize"
-        :total="total"
-        @pagination="getPage"
-      />
-    </div>
-    <!-- 图 -->
-    <monitoring-ring-charts ref='monitoringRingCharts' v-else :chart-list='chartList'/>
-  </div>
-</template>
-<script>
-import { parseTime } from '@/utils/ruoyi'
-import { publicFormatter } from '@/utils/dict'
-import { orderMonitor, orderAssignmentList } from '@/api/base/orderManage'
-import MonitoringRingCharts from './../components/monitoringRingCharts'
-import moment from "moment"
-const tableProps = [
-  {
-    prop: 'name',
-    label: '订单名称'
-  },
-  {
-    prop: 'customerName',
-    label: '客户'
-  },
-  {
-    prop: 'productname',
-    label: '产品'
-  },
-  {
-    prop: 'planStartTime',
-    label: '计划开始时间',
-    filter: parseTime,
-    minWidth: 160
-  },
-  {
-    prop: 'planFinishTime',
-    label: '计划完成时间',
-    filter: parseTime,
-    minWidth: 160
-  },
-  {
-    prop: 'status',
-    label: '订单状态',
-    filter: publicFormatter('order_status')
-  },
-  {
-    prop: 'startProduceTime',
-    label: '实际开始时间',
-    filter: parseTime,
-    minWidth: 160
-  },
-  {
-    prop: 'finishProduceTime',
-    label: '实际完成时间',
-    filter: parseTime,
-    minWidth: 160
-  },
-  {
-    prop: 'lineNames',
-    label: '加工线',
-    filter: (val) => val ? val.join(',') : '',
-    minWidth: 180
-  },
-  {
-    prop: 'planQuantity',
-    label: '计划生产量',
-    width: 100
-  },
-  {
-    prop: 'actualquantity',
-    label: '实际产出量',
-    width: 100
-  },
-  {
-    prop: 'completeRate',
-    label: '订单完成率',
-    width: 100
-  },
-  {
-    prop: 'workOrderNum',
-    label: '关联工单数量',
-    width: 110
-  }
-]
-export default {
-  name: 'OrderCompletionMonitoring',
-  data() {
-    return {
-      formConfig: [
-        {
-          type: 'input',
-          label: '订单名称',
-          param: 'name'
-        },
-        {
-          type: 'datePicker',
-          label: '时间段',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: "yyyy-MM-dd",
-          rangeSeparator: '-',
-          startPlaceholder: '开始时间',
-          endPlaceholder: '结束时间',
-          param: 'timeVal',
-          defaultSelect: [],
-          width: 250
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        }
-      ],
-      activeName: 'dataList',
-      // 查询参数
-      queryParams: {
-        pageNo: 1,
-        pageSize: 20,
-        name: null,
-        startProduceTime: []
-      },
-      tableProps,
-      list: [],
-      tableH: this.tableHeight(305),
-      total: 0,
-      tableBtn: [
-      this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
-          ? {
-              type: 'orderDetail',
-              btnName: '工单',
-              showTip: '工单详情',
-              showParam: {
-                type: '&',
-                data: [
-                  {
-                    type: 'more',
-                    name: 'workOrderNum',
-                    value: 1
-                  }
-                ]
-              }
-            }
-          : undefined,
-      this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
-          ? {
-              type: 'qualityDetail',
-              btnName: '质量',
-              showTip: '质量详情',
-              showParam: {
-                type: '&',
-                data: [
-                  {
-                    type: 'more',
-                    name: 'workOrderNum',
-                    value: 1
-                  }
-                ]
-              }
-            }
-          : undefined,
-      this.$auth.hasPermi('base:order-completion-monitoring:sendOut')
-          ? {
-              type: 'sendOutDetail',
-              btnName: '发货',
-              showTip: '发货详情',
-              showParam: {
-                type: '&',
-                data: [
-                  {
-                    type: 'more',
-                    name: 'workOrderNum',
-                    value: 1
-                  }
-                ]
-              }
-            }
-          : undefined
-      ].filter((v) => v),
-      chartList: []
-    }
-  },
-  components: { MonitoringRingCharts },
-  mounted() {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(305)
-    })
-    let start = moment().subtract(30, 'days').format('yyyy-MM-DD')
-    let end = moment().format('yyyy-MM-DD')
-    this.formConfig[1].defaultSelect = [start, end]
-    this.queryParams.startProduceTime[0] = start + ' 00:00:00'
-    this.queryParams.startProduceTime[1] = end + ' 23:59:59'
-    this.getPage()
-  },
-  methods: {
-    getPage() {
-      // 表数据
-      orderMonitor({...this.queryParams}).then(res => {
-        this.list = res.data.records || []
-        this.total = res.data.total || 0
-        if (this.list.length > 0) {
-          let orderIdList = []
-          this.list.map(item => {
-            orderIdList.push(item.orderid)
-          })
-          // 图的数据
-          orderAssignmentList({orderIdList:orderIdList}).then(res => {
-            let color = ['#7164FF','#288AFF','#63BDFF','#8EF0AB','#FFCE6A']
-            let tempArr = res.data || {}
-            let tempArr2 = []
-            for (let key in tempArr) {
-              let tempArr3 = []
-              let obj = {}
-              obj.orderName = tempArr[key][0].orderName
-              obj.id = key
-              obj.num = tempArr[key][0].planQuantity
-              let sunNum = 0
-              for (let i = 0; i < tempArr[key].length; i++) {
-                let subObj = {}
-                subObj.value = tempArr[key][i].actualAssignmentQuantity
-                subObj.name = tempArr[key][i].woName
-                if (i < 5) {
-                  subObj.color = color[i]
-                } else {
-                  subObj.color = color[i%5]
-                }
-                sunNum+=tempArr[key][i].actualAssignmentQuantity
-                tempArr3.push(subObj)
-              }
-              tempArr3.push({
-                value: tempArr[key][0].planQuantity - sunNum > 0 ? tempArr[key][0].planQuantity - sunNum : 0,
-                name: '未下发',
-                color: '#F5F5F5'
-              })
-              obj.sunNum = sunNum
-              obj.workOrder = tempArr3
-              tempArr2.push(obj)
-            }
-            this.chartList = tempArr2
-            if (this.activeName === 'barChart' && this.chartList.length > 0) {
-              this.$nextTick(() => {
-                this.$refs.monitoringRingCharts.initChart()
-              })
-            }
-          })
-        }else{
-          // 显示无数据的图片
-          this.chartList = []
-        }
-      })
-    },
-    // 查询
-    buttonClick(val) {
-      this.queryParams.name = val.name
-      if (val.timeVal && val.timeVal.length > 0) {
-        this.queryParams.startProduceTime[0] = val.timeVal[0] + ' 00:00:00'
-        this.queryParams.startProduceTime[1] = val.timeVal[1] + ' 23:59:59'
-      } else {
-        this.queryParams.startProduceTime = []
-      }
-      this.getPage()
-    },
-    handleClick(val) {
-      console.log(val)
-      switch (val.type) {
-        case 'orderDetail':
-          this.$router.push({
-            path: '/core/core-work-order-detail?woIdString='+val.data.woIdString
-          })
-          break
-        case 'qualityDetail':
-          this.$router.push({
-            path: '/quality/base/quality-inspection-data/detection-information/statistical-data?woIdString='+val.data.woIdString
-          })
-          break
-        default:
-          this.$router.push({
-            path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
-          })
-        }
-    },
-    toggleTab() {
-      if (this.activeName === 'barChart' && this.chartList.length > 0) {
-        this.$nextTick(() => {
-          this.$refs.monitoringRingCharts.initChart()
-        })
-      }
-    }
-}
-}
-</script>
-<style lang='scss'>
-.orderMonitoring {
-  .el-tabs__nav::after {
-    content: "";
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    width: 100%;
-    height: 2px;
-    background-color: #e4e7ed;
-  }
-  .el-tabs__nav-wrap::after {
-    width: 0;
-  }
-  .el-tabs__item {
-    padding: 0 10px;
-  }
-  .el-tabs__item:hover {
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .el-tabs__item.is-active {
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .el-tabs__item {
-    color: rgba(0, 0, 0, 0.45);
-  }
-  .searchBarBox {
-    margin-bottom: 0;
-  }
-  .boxTitle {
-    display: inline-block;
-    font-size: 16px;
-    font-weight: 400;
-    color: #000000;
-    margin:0 10px 16px 0;
-  }
-  .blueTitle {
-    content: '';
-    display: inline-block;
-    width: 4px;
-    height: 18px;
-    background-color: #0B58FF;
-    border-radius: 1px;
-    margin-right: 8px;
-    vertical-align: bottom;
-  }
-}
-</style>

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

@@ -1,290 +1,489 @@
 <template>
-  <el-form ref="addWorkOrder" :rules="rules" label-width="130px" :model="form" label-position='top'>
+	<el-form
-    <el-row :gutter="20">
+		ref="addWorkOrder"
-      <el-col :span='6'>
+		:rules="rules"
-        <el-form-item label="工单名称" prop="name" v-if='!isBind'>
+		label-width="130px"
-          <el-input v-model="form.name"></el-input>
+		:model="form"
-        </el-form-item>
+		label-position="top">
-        <el-form-item label="工单名称" prop="workOrderId" v-if='isBind'>
+		<el-row :gutter="20">
-          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" filterable
+			<el-col :span="6">
-            @change="getWorkOrderMsg">
+				<el-form-item label="工单模式">
-            <el-option v-for="item in workOrderList" :key="item.id" :label="item.name" :value="item.id">
+					<el-radio-group v-model="isBind" @input='toggleWay'>
-            </el-option>
+						<el-radio :label="true">绑定工单</el-radio>
-          </el-select>
+						<el-radio :label="false">新增工单</el-radio>
-        </el-form-item>
+					</el-radio-group>
-      </el-col>
+				</el-form-item>
-      <el-col :span='6'>
+			</el-col>
-        <el-form-item label="工单编码" prop="code">
+			<el-col :span="6">
-          <el-input v-model="form.code" disabled></el-input>
+				<el-form-item label="工单名称" prop="name" v-if="!isBind">
-        </el-form-item>
+					<el-input v-model="form.name"></el-input>
-      </el-col>
+				</el-form-item>
-      <el-col :span='6'>
+				<el-form-item label="工单名称" prop="workOrderId" v-if="isBind">
-        <el-form-item label="产品名称" prop="planProductId">
+					<el-select
-          <el-select v-model="form.planProductId" placeholder="请选择" disabled style="width: 100%;">
+						v-model="form.workOrderId"
-            <el-option v-for="item in productList" :key="item.id" :label="item.name+' | '+item.specifications"
+						placeholder="请选择"
-              :value="item.id">
+						style="width: 100%"
-              <span style="float: left">{{ item.name }}</span>
+						filterable
-              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.specifications }}</span>
+						@change="getWorkOrderMsg">
-            </el-option>
+						<el-option
-          </el-select>
+							v-for="item in workOrderList"
-        </el-form-item>
+							:key="item.id"
-      </el-col>
+							:label="item.name"
-      <el-col :span='6'>
+							:value="item.id"></el-option>
-        <el-form-item label="计划开始时间">
+					</el-select>
-          <el-date-picker v-model="planStartTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+				</el-form-item>
-            style="width: 100%;" placeholder="选择日期" :disabled="isBind">
+			</el-col>
-          </el-date-picker>
+			<el-col :span="6">
-        </el-form-item>
+				<el-form-item label="工单编码" prop="code">
-      </el-col>
+					<el-input v-model="form.code" disabled></el-input>
-    </el-row>
+				</el-form-item>
-    <el-row :gutter="20">
+			</el-col>
-      <el-col :span='6'>
+			<el-col :span="6">
-        <el-form-item label="计划完成时间">
+				<el-form-item label="产品名称" prop="planProductId">
-          <el-date-picker v-model="planFinishTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+					<el-select
-            style="width: 100%;" placeholder="选择日期" :disabled="isBind">
+						v-model="form.planProductId"
-          </el-date-picker>
+						placeholder="请选择"
-        </el-form-item>
+						disabled
-      </el-col>
+						style="width: 100%">
-      <el-col :span='6'>
+						<el-option
-        <el-form-item label="计划投入数量" prop="planAssignQuantity">
+							v-for="item in productList"
-          <el-input-number v-model="form.planAssignQuantity" :min="0" :max="9999999999999" :disabled="isBind"
+							:key="item.id"
-            style="width: 100%;"></el-input-number>
+							:label="item.name"
-        </el-form-item>
+							:value="item.id"/>
-      </el-col>
+					</el-select>
-      <el-col :span='6'>
+				</el-form-item>
-        <el-form-item label="计划生产数量" prop="planQuantity">
+			</el-col>
-          <el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" :disabled="isBind"
+			<el-col :span="6">
-            style="width: 100%;"></el-input-number>
+				<el-form-item label="产品规格" prop="specifications">
-        </el-form-item>
+					<el-input
-      </el-col>
+						v-model="form.specifications"
-      <el-col :span='6'>
+						placeholder="请输入产品规格"
-        <el-form-item label="关联工艺" prop="processFlowId">
+						disabled />
-          <el-select v-model="form.processFlowId" placeholder="请选择" disabled style="width: 100%;">
+				</el-form-item>
-            <el-option v-for="item in processFlowList" :key="item.id" :label="item.name" :value="item.id">
+			</el-col>
-            </el-option>
+			<el-col :span="6">
-          </el-select>
+				<el-form-item label="计划开始时间">
-        </el-form-item>
+					<el-date-picker
-      </el-col>
+						v-model="planStartTime"
-    </el-row>
+						type="datetime"
-    <el-row :gutter="20">
+						value-format="yyyy-MM-dd HH:mm:ss"
-      <el-col :span='6'>
+						style="width: 100%"
-        <el-form-item label="物料计算方式" prop="materialMethod">
+						placeholder="选择日期"
-          <el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" disabled>
+						:disabled="isBind"></el-date-picker>
-            <el-option label="产品基础BOM" :value="1"></el-option>
+				</el-form-item>
-            <el-option label="工艺扩展BOM" :value="2"></el-option>
+			</el-col>
-          </el-select>
+			<el-col :span="6">
-        </el-form-item>
+				<el-form-item label="计划完成时间">
-      </el-col>
+					<el-date-picker
-      <el-col :span='6'>
+						v-model="planFinishTime"
-        <el-form-item label="优先级" prop="priority">
+						type="datetime"
-          <el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" :disabled="isBind">
+						value-format="yyyy-MM-dd HH:mm:ss"
-            <el-option v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)" :key="item.value" :label="item.label"
+						style="width: 100%"
-              :value="item.value">
+						placeholder="选择日期"
-            </el-option>
+						:disabled="isBind"></el-date-picker>
-          </el-select>
+				</el-form-item>
-        </el-form-item>
+			</el-col>
-      </el-col>
+			<el-col :span="6">
-      <el-col :span='6'>
+				<el-form-item label="计划投入数量" prop="planAssignQuantity">
-        <el-form-item label="工单类型" prop="type">
+					<el-input-number
-          <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" :disabled="isBind">
+						v-model="form.planAssignQuantity"
-            <el-option v-for="item in workOrderTypeList" :key="item.id" :label="item.name" :value="item.id">
+						:min="0"
-            </el-option>
+						:max="9999999999999"
-          </el-select>
+						:disabled="isBind"
-        </el-form-item>
+						style="width: 100%"></el-input-number>
-      </el-col>
+				</el-form-item>
-      <el-col :span='6'>
+			</el-col>
-        <el-form-item label="关联产线" prop="productLineId">
+			<el-col :span="6">
-          <el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind">
+				<el-form-item label="计划生产数量" prop="planQuantity">
-            <el-option v-for="item in productLineList" :key="item.id" :label="item.name" :value="item.id">
+					<el-input-number
-            </el-option>
+						v-model="form.planQuantity"
-          </el-select>
+						:min="0"
-        </el-form-item>
+						:max="9999999999999"
-      </el-col>
+						:disabled="isBind"
-    </el-row>
+						style="width: 100%"></el-input-number>
-    <el-row :gutter="20">
+				</el-form-item>
-      <el-col :span='6'>
+			</el-col>
-        <el-form-item label="负责人" prop="workers">
+			<el-col :span="6">
-          <el-input v-model="form.workers" :disabled="isBind"></el-input>
+				<el-form-item label="工单类型" prop="type">
-        </el-form-item>
+					<el-select
-      </el-col>
+						v-model="form.type"
-      <el-col :span='6'>
+						placeholder="请选择"
-        <el-form-item label="负责部门" prop="deptId">
+						style="width: 100%"
-          <el-select v-model="form.deptId" placeholder="请选择关联产线" style="width: 100%;">
+						:disabled="isBind">
-            <el-option v-for="item in deptList" :key="item.id" :label="item.name" :value="item.id">
+						<el-option
-            </el-option>
+							v-for="item in workOrderTypeList"
-          </el-select>
+							:key="item.id"
-        </el-form-item>
+							:label="item.name"
-      </el-col>
+							:value="item.id"></el-option>
-      <el-col :span='6'>
+					</el-select>
-        <el-form-item label="计划分配订单量" prop="planAssignmentQuantity">
+				</el-form-item>
-          <el-input-number v-model="form.planAssignmentQuantity" :min="0" :max="9999999999999" style="width: 100%;">
+			</el-col>
-          </el-input-number>
+			<el-col :span="6">
-        </el-form-item>
+				<el-form-item label="负责部门" prop="deptId">
-      </el-col>
+					<el-select
-    </el-row>
+						v-model="form.deptId"
-  </el-form>
+						placeholder="请选择关联产线"
+						style="width: 100%"
+						:disabled="isBind">
+						<el-option
+							v-for="item in deptList"
+							:key="item.id"
+							:label="item.name"
+							:value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+		</el-row>
+		<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="item.lineId"
+						placeholder="请选择产线"
+						:disabled="isBind"
+						style="width: 100%">
+						<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-tooltip effect="dark" content="该产线分配生产数量" placement="top-end">
+					<el-input-number
+						style="width: 100%"
+						v-model="item.num"
+						placeholder="请输入数量"
+						:step="1"
+						:min="0"
+						:disabled="isBind"
+						step-strictly />
+            </el-tooltip>
+				</el-col>
+			</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, getWorkOrderCode, orderIssue, workOrderList, getWorkOrderById } from '@/api/base/orderManage'
+import {
-import { getLineAll } from '@/api/base/productionLine'
+	getProcessFlowPage,
+	orderIssue,
+	workOrderList,
+	getWorkOrderById,
+} from '@/api/base/orderManage';
+import { getLineAll } from '@/api/base/productionLine';
 import { listDept } from '@/api/system/dept';
-import moment from 'moment'
+import moment from 'moment';
+import { getCode } from '@/api/base/coreWorkOrder';
 export default {
-  name: 'AddWorkOrder',
+	name: 'AddWorkOrder',
-  data() {
+	data() {
-    return {
+		return {
-      form: {
+			form: {
-        workOrderId: '',
+				workOrderId: '',
-        orderId: '',
+				name: '',
-        name: '',
+				code: '',
-        code: '',
+				planProductId: '',
-        planProductId: '',
+				planStartTime: '',
-        planStartTime: '',
+				planFinishTime: '',
-        planFinishTime: '',
+				planAssignQuantity: 0,
-        planAssignQuantity: 0,
+				deptId: undefined,
-        deptId:undefined,
+				planQuantity: 0,
-        planQuantity: 0,
+				materialMethod: 1,
-        processFlowId: '',
+				productLineIds: [{ lineId: null, processId: null, num: null }],
-        materialMethod: 1,
+				type: '',
-        priority: '',
+				planAssignmentQuantity: '',
-        productLineId: [],
+			},
-        type: '',
+			deptList: [],
-        workers: '',
+			rules: {
-        planAssignmentQuantity: ''
+				name: [
-      },
+					{ required: true, message: '工单名称不能为空', trigger: 'blur' },
-      deptList:[],
+				],
-      rules: {
+				workOrderId:[
-        name: [{ required: true, message: "工单名称不能为空", trigger: "blur" }],
+				{ required: true, message: '工单名称不能为空', trigger: 'change' },
-        planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
+				],
-        planAssignQuantity: [{ required: true, message: "计划投入数量不能为空", trigger: "blur" }],
+				planProductId: [
-        planQuantity: [{ required: true, message: "计划生产数量不能为空", trigger: "blur" }],
+					{ required: true, message: '产品名称不能为空', trigger: 'change' },
-        productLineId: [{ required: true, message: "产线不能为空", trigger: "change" }],
+				],
-        planAssignmentQuantity: [{ required: true, message: "计划分配订单量不能为空", trigger: "blur" }]
+				planAssignQuantity: [
-      },
+					{ required: true, message: '计划投入数量不能为空', trigger: 'blur' },
-      productList: [],
+				],
-      processFlowList: [],
+				planQuantity: [
-      productLineList: [],
+					{ required: true, message: '计划生产数量不能为空', trigger: 'blur' },
-      workOrderTypeList: [
+				],
-        {id: 1,name:'标准工单'},
+				planAssignmentQuantity: [
-        {id: 2, name:'特殊工单'}
+					{
-      ],
+						required: true,
-      planStartTime: '',
+						message: '计划分配订单量不能为空',
-      planFinishTime: '',
+						trigger: 'blur',
-      isBind: false,
+					},
-      workOrderList: []
+				],
-    }
+				deptId:[
-  },
+					{ required: true, message: '负责部门不能为空', trigger: 'change' },
-  methods: {
+				],
-    init(data, param) {
+			},
-      this.form.orderId = data.id
+			productList: [],
-      this.getList()
+			processFlowList: [],
-      if (param === 'add') {
+			productLineList: [],
-        this.isBind = false
+			workOrderTypeList: [
-        getWorkOrderCode().then(res => {
+				{ id: 1, name: '普通' },
-          this.form.code = res.data || ''
+				{ id: 2, name: '特殊' },
-        })
+			],
-        this.form.planProductId = data.planProductId
+			planStartTime: '',
-        this.form.processFlowId = data.processFlowId
+			planFinishTime: '',
-        this.form.materialMethod = data.materialMethod
+			isBind: true,
-      }else{//绑定
+			workOrderList: [],
-        this.isBind = true
+			orderData: {},
-      }
+		};
-    },
+	},
-    getList() {
+	methods: {
-      listDept().then(res => {
+		// 工艺变更
-        this.deptList = res.data || []
+		materialMethodChange(val) {
-      })
+			console.log(val);
-      // 产品
+			this.processFlowList = [];
-      getProductAll().then(res => {
+			this.form.productLineIds = [];
-        this.productList = res.data || []
+			const obj = { lineId: null, processId: null, num: null };
-      })
+			this.form.productLineIds.push(obj);
-      // 产线
+		},
-      getLineAll().then(res => {
+		// 产线工艺关联
-        this.productLineList = res.data || []
+		processLineIdChange(val) {
-      })
+			const params = {
-      // 工艺
+				pageNo: 1,
-      getProcessFlowList().then(res => {
+				pageSize: 100,
-        this.processFlowList = res.data || []
+				lineId: val,
-      })
+			};
-      // 工单list
+			// 工艺
-      workOrderList({
+			getProcessFlowPage(params).then((res) => {
-        status: 1
+				this.processFlowList = res.data.list || [];
-      }).then(res => {
+				console.log(this.processFlowList);
-        this.workOrderList = res.data || []
+			});
-      })
+		},
-    },
+		init(data, param) {
-    addWorkOrderSubmit() {
+			this.isBind = true;
-      this.$refs['addWorkOrder'].validate((valid) => {
+			this.orderData = data;
-        if (valid) {
+			this.getList();
-          if (this.isBind) {
+		},
-            //绑定工单
+		toggleWay(val) {
-            orderIssue({
+			console.log(val);
-              workOrderId: this.form.workOrderId,
+			this.formClear()
-              orderId: this.form.orderId,
+			if (!val) {
-              planAssignmentQuantity: this.form.planAssignmentQuantity
+				// 获取工单编码
-             }).then((res) => {
+				getCode().then((res) => {
-              if (res.code === 0) {
+				  this.form.code = res.data;
-                this.$modal.msgSuccess("操作成功")
+					this.form.planProductId = this.orderData.planProductId;
-                this.$emit('addWorkOrderSubmit')
+					this.form.name = '';
-              }
+					this.selectProduct(this.form.planProductId)
-            })
+				})
-          } else {
+			}else{
-            // 新增工单
+				this.form.code = '';
-            let _this = this
+				this.form.planProductId = '';
-            _this.form.planStartTime = _this.planStartTime ? new Date(_this.planStartTime).valueOf() : ''
+			}
-            _this.form.planFinishTime = _this.planFinishTime ? new Date(_this.planFinishTime).valueOf() : ''
+			this.form.materialMethod = 1;
-            orderIssue({ ..._this.form }).then(res => {
+			this.form.productLineIds = [];
-              if (res.code === 0) {
+		},
-                _this.$modal.msgSuccess("操作成功")
+		getList() {
-                let name = this.form.name
+			listDept().then((res) => {
-                _this.$emit('addWorkOrderSubmit')
+				this.deptList = res.data || [];
-                // 询问是否添加预使用主原料
+			});
-                // _this.$modal.confirm('是否添加预使用主原料信息?').then(function() {
+			// 产品
-                //     _this.$router.push({
+			getProductList().then((res) => {
-                //       path: '/core/core-work-order?workOrderName='+encodeURI(name)
+				this.productList = res.data || [];
-                //     })
+			});
-                //   })
+			// 产线
-              }
+			getLineAll().then((res) => {
-            })
+				this.productLineList = res.data || [];
-          }
+			});
-        } else {
+			// 工单list
-          return false
+			workOrderList({
-        }
+				status: 1,
-      })
+			}).then((res) => {
-    },
+				this.workOrderList = res.data || [];
-    formClear() {
+			});
-      this.$refs.addWorkOrder.resetFields()
+		},
-      this.form.materialMethod = 1
+		// 选产品带出规格
-      this.form.planAssignQuantity = 0
+		selectProduct(val) {
-      this.form.planQuantity = 0
+			if (val) {
-      this.planFinishTime = ''
+				this.productList.map((item) => {
-      this.planStartTime = ''
+					if (val === item.id) {
-      this.form.planFinishTime = ''
+						this.form.specifications = item.specifications;
-      this.form.planStartTime = ''
+					}
-      this.isBind = false
+				});
-    },
+			} else {
-    // 绑定工单，选择工单时获取工单信息
+				this.form.specifications = '';
-    getWorkOrderMsg() {
+			}
-      if (this.form.workOrderId) {
+		},
-        getWorkOrderById({id:this.form.workOrderId}).then(res => {
+		addWorkOrderSubmit() {
-          if (res.code === 0) {
+			this.$refs['addWorkOrder'].validate((valid) => {
-            this.form.code = res.data.code
+				if (valid) {
-            this.form.planProductId = res.data.planProductId
+					if (this.isBind) {
-            this.planStartTime = res.data.planStartTime ? moment.unix(res.data.planStartTime).format('YYYY-MM-DD HH:mm:ss') : null
+						//绑定工单
-            this.planFinishTime = res.data.planFinishTime ? moment.unix(res.data.planFinishTime).format('YYYY-MM-DD HH:mm:ss') : null
+						orderIssue({
-            this.form.planAssignQuantity = res.data.planAssignQuantity
+							workOrderId: this.form.workOrderId,
-            this.form.planQuantity = res.data.planQuantity
+							orderId: this.orderData.id,
-            this.form.processFlowId = res.data.processFlowId
+						}).then((res) => {
-            this.form.materialMethod = res.data.materialMethod
+							if (res.code === 0) {
-            this.form.priority = res.data.priority ? res.data.priority + '' : ''
+								this.$modal.msgSuccess('操作成功');
-            this.form.productLineId = res.data.productLineIds
+								this.$emit('addWorkOrderSubmit');
-            this.form.type = res.data.type
+							}
-            this.form.workers = res.data.workers
+						});
-          }
+					} else {
-        })
+						// 新增工单
-      }
+						this.form.planStartTime = this.planStartTime
-    }
+							? new Date(this.planStartTime).valueOf()
-  }
+							: '';
-}
+						this.form.planFinishTime = this.planFinishTime
+							? new Date(this.planFinishTime).valueOf()
+							: '';
+						orderIssue({
+							...this.form,
+							orderId: this.orderData.id,
+						}).then((res) => {
+							if (res.code === 0) {
+								this.$modal.msgSuccess('操作成功');
+								this.$emit('addWorkOrderSubmit');
+							}
+						});
+					}
+				} else {
+					return false;
+				}
+			});
+		},
+		formClear() {
+			this.$refs.addWorkOrder.resetFields();
+			this.form.materialMethod = 1;
+			this.form.planAssignQuantity = 0;
+			this.form.planQuantity = 0;
+			this.planFinishTime = '';
+			this.planStartTime = '';
+			this.form.planFinishTime = '';
+			this.form.planStartTime = '';
+		},
+		// 绑定工单，选择工单时获取工单信息
+		getWorkOrderMsg() {
+			if (this.form.workOrderId) {
+				getWorkOrderById({ id: this.form.workOrderId }).then((res) => {
+					if (res.code === 0) {
+						this.form = res.data;
+						this.form.workOrderId = res.data.id;
+						this.planStartTime = res.data.planStartTime
+							? moment(res.data.planStartTime)
+									.format('YYYY-MM-DD HH:mm:ss')
+							: null;
+						this.planFinishTime = res.data.planFinishTime
+							? moment(res.data.planFinishTime)
+									.format('YYYY-MM-DD HH:mm:ss')
+							: null;
+						// 根据产线获取工艺
+						if (this.form.materialMethod === 2) {
+							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/inputArea.vue

@@ -22,7 +22,7 @@ export default {
   },
   methods: {
     changeInput() {
-      console.log(this.list)
+      this.list.sType = 1
       this.$emit('emitData', this.list)
     }
   }

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,14 +32,20 @@
               <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">
       <el-col :span='6'>
-        <el-form-item label="单价" prop="price">
+        <el-form-item label="产品规格" prop="specifications">
-          <el-input-number v-model="form.price" :min="0" :max="9999999999999" :precision='2' style="width: 100%;">
+          <el-input v-model="form.specifications"></el-input>
-          </el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span='6'>
+        <el-form-item label="交货日期" prop="deliveTime">
+          <el-date-picker v-model="form.deliveTime" type="datetime" style="width: 100%;" value-format="timestamp"
+            @change="timeChange" placeholder="选择日期">
+          </el-date-picker>
         </el-form-item>
       </el-col>
       <el-col :span='6'>
@@ -53,23 +65,9 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span='6'>
-        <el-form-item label="交货日期" prop="deliveTime">
-          <el-date-picker v-model="form.deliveTime" type="datetime" style="width: 100%;" value-format="timestamp"
-            @change="timeChange" placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
     </el-row>
     <el-row :gutter="20">
-    </el-row>
+      <el-col :span='24'>
-    <el-row :gutter="20">
-      <el-col :span='6'>
-        <el-form-item label="产品规格" prop="specifications">
-          <el-input v-model="form.specifications"></el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span='12'>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark"></el-input>
         </el-form-item>
@@ -79,7 +77,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',
@@ -93,9 +91,7 @@ export default {
         planQuantity: '',
         planProductId: '',
         specifications:undefined,
-        price: '',
         customerId: '',
-        priority: '',
         packSpec: '',
         workers: '',
         materialMethod: 1,
@@ -108,7 +104,8 @@ export default {
         name: [{ required: true, message: "订单名称不能为空", trigger: "blur" }],
         code: [{ required: true, message: "订单号不能为空", trigger: "blur" }],
         planQuantity: [{ required: true, message: "计划加工数量不能为空", trigger: "blur" }],
-        planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }]
+        planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }],
+        deliveTime: [{ required: true, message: "交货日期不能为空", trigger: "change" }]
       },
       productList: [],
       customerList: [],
@@ -136,9 +133,7 @@ export default {
             this.form.code = res.data.code
             this.form.planQuantity = res.data.planQuantity
             this.form.planProductId = res.data.planProductId
-            this.form.price = res.data.price
             this.form.customerId = res.data.customerId
-            this.form.priority = res.data.priority ? res.data.priority + '' : ''
             this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
             this.form.packSpec = res.data.packSpec ? res.data.packSpec+'' : ''
             this.form.workers = res.data.workers
@@ -160,7 +155,7 @@ export default {
     },
     getList() {
       // 产品
-      getProductAll().then(res => {
+      getProductList().then(res => {
         this.productList = res.data || []
       })
       // 客户
@@ -229,7 +224,6 @@ export default {
     formClear() {
       this.$refs.orderAddForm.resetFields()
       this.form.materialMethod = 1
-      this.form.price = 0.00
       this.form.planQuantity = 0
       this.isEdit = false
     }

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

@@ -1,257 +1,298 @@
 <!--
- * @Author: zhp
+ * @Author: zwq
- * @Date: 2024-08-01 16:27:30
+ * @Date: 2024-09-26 14:08:58
- * @LastEditTime: 2024-09-04 15:56:53
+ * @LastEditors: zwq
- * @LastEditors: zhp
+ * @LastEditTime: 2024-11-13 15:23:25
  * @Description:
 -->
 <template>
-  <el-form ref="orderAddForm" :rules="rules" :model="form" :inline="true" class="demo-form-inline">
+	<el-form
-    <!-- <el-row :gutter="20"> -->
+		ref="orderAddForm"
-    <!-- <el-col :span='6'> -->
+		:rules="rules"
-    <el-form-item label="拆分数量" prop="attr3">
+		:model="form"
-      <el-input v-model.number="form.attr3" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+		:inline="true"
-    </el-form-item>
+		class="demo-form-inline">
-    <el-form-item>
+		<!-- <el-row :gutter="20"> -->
-      <el-button type="primary" @click="handleSplit">确定</el-button>
+		<!-- <el-col :span='6'> -->
-    </el-form-item>
+		<el-form-item label="拆分数量" prop="attr3">
-    <!-- </el-col> -->
+			<el-input
-    <!-- </el-row> -->
+				v-model.number="form.attr3"
-    <base-table :table-props="tableProps" :table-data="list" :max-height="tableH">
+				oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-      <!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="240" label="操作" :method-list="tableBtn"
+		</el-form-item>
+		<el-form-item>
+			<el-button type="primary" @click="handleSplit">确定</el-button>
+		</el-form-item>
+		<!-- </el-col> -->
+		<!-- </el-row> -->
+		<base-table
+			:table-props="tableProps"
+			:table-data="list"
+			@emitFun="inputChange"
+			:max-height="tableH">
+			<!-- <method-btn v-if="tableBtn.length" slot="handleBtn" :width="240" label="操作" :method-list="tableBtn"
         @clickBtn="handleClick" /> -->
-    </base-table>
+		</base-table>
-  </el-form>
+	</el-form>
 </template>
 <script>
-import { getOrderCode, getOrderById, getProcessFlowList, orderUpdate, orderCreate, orderSplit } from '@/api/base/orderManage'
+import {
-import { parseTime } from '@/utils/ruoyi'
+	getOrderCode,
-import inputArea from './inputArea.vue'
+	getOrderById,
-const tableProps = [
+	getProcessFlowList,
-  {
+	orderUpdate,
-    prop: 'name',
+	orderCreate,
-    label: '订单名称',
+	orderSplit,
-    minWidth: 120,
+} from '@/api/base/orderManage';
-    showOverflowtooltip: true,
-    subcomponent: inputArea
-  },
-  {
-    prop: 'code',
-    label: '订单编码',
-    minWidth: 180,
-    subcomponent: inputArea
-  },
-  {
-    prop: 'productName',
-    label: '产品',
-    showOverflowtooltip: true,
-    subcomponent: inputArea
-  },
-  // {
-  //   prop: 'priority',
-  //   label: '优先级',
-  //   filter: publicFormatter('order_priority')
-  // },
-  {
-    prop: 'planQuantity',
-    label: '计划加工量',
-    width: 100,
-    subcomponent: inputArea
-  },
-  {
-    prop: 'deliveTime',
-    label: '交货日期',
-    filter: parseTime,
-    minWidth: 160,
-    subcomponent: inputArea
-  },
-  {
-    prop: 'customerId',
-    label: '客户',
-    showOverflowtooltip: true,
-    subcomponent: inputArea
-  },
-  {
-    prop: 'price',
-    label: '单价',
-    width: 100,
-    subcomponent: inputArea
-  },
-  {
-    prop: 'packSpec',
-    label: '包装规格',
-    width: 100,
-    subcomponent: inputArea
-  },
-  {
-    prop: 'remark',
-    label: '备注',
-    width: 100,
-    subcomponent: inputArea
-  },
-]
-export default {
-  name: 'OrderAdd',
-  data() {
-    return {
-      tableProps,
-      list: [],
-      tableH: this.tableHeight(260),
-      form: {
-        id: '',
-        name: '',
-        code: '',
-        planQuantity: '',
-        planProductId: '',
-        price: '',
-        customerId: '',
-        attr3:undefined,
-        priority: '',
-        packSpec: '',
-        workers: '',
-        materialMethod: 1,
-        remark: '',
-        deliveTime:undefined,
-        // description: '',
-        planStartTime: '',
-      },
-      rules: {
-        attr3: [{ required: true, message: "拆分数量不能为空", trigger: "blur" }],
-      },
-      productList: [],
-      customerList: [],
-      processFlowList: [],
-      isEdit: false //是否是编辑
-    }
-  },
-  created () {
-    window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(260)
-    })
-  },
-  methods: {
-    handleSplit() {
-      let obj = {
-        attr3: this.form.attr3,
-        id:this.form.id
-      }
-      orderSplit(obj).then((res) => {
-        this.list = res.data
-      })
-    },
-    init(obj) {
-      // this.getList()
-      // if (obj) {
-      this.isEdit = true
-      this.form = {}
-      this.list = []
-      this.form.id = obj.id
-      //   getOrderById({id: this.form.id}).then(res => {
-      //     if (res.code === 0) {
-      //       this.form.name = res.data.name
-      //       this.form.code = res.data.code
-      //       this.form.planQuantity = res.data.planQuantity
-      //       this.form.planProductId = res.data.planProductId
-      //       this.form.price = res.data.price
-      //       this.form.customerId = res.data.customerId
-      //       this.form.priority = res.data.priority ? res.data.priority + '' : ''
-      //       this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
-      //       this.form.packSpec = res.data.packSpec ? res.data.packSpec+'' : ''
-      //       this.form.workers = res.data.workers
-      //       this.form.processFlowId = res.data.processFlowId
-      //       this.form.materialMethod = res.data.materialMethod
-      //       this.form.planFinishTime = res.data.planFinishTime ? res.data.planFinishTime : null
-      //       this.form.remark = res.data.remark
-      //       // this.form.description = res.data.description
-      //     }
-      //   })
-      // } else {
-      //   this.isEdit = false
-      //   this.form.id = ''
-      //   // 订单号
-      //   getOrderCode().then(res => {
-      //     this.form.code = res.data || ''
-      //   })
-      // }
-    },
-    // getList() {
-    //   // 产品
-    //   getProductAll().then(res => {
-    //     this.productList = res.data || []
-    //   })
-    //   // 客户
-    //   getCustomerList().then(res => {
-    //     this.customerList = res.data || []
-    //   })
-    //   // 工艺
-    //   getProcessFlowList().then(res => {
-    //     this.processFlowList = res.data || []
-    //   })
-    // },
-    // timeChange() {
-    //   if (this.form.planStartTime && this.form.planFinishTime) {
-    //     if (this.form.planStartTime > this.form.planFinishTime) {
-    //       this.$modal.msgError('计划开始时间不能大于结束时间')
-    //     }
-    //   }
-    // },
-    // // 工艺变更
-    // materialMethodChange(val) {
-    //   if (val === 2 && !this.form.processFlowId) {
-    //     this.form.materialMethod = 1
-    //     this.$modal.msgError("请先选择关联工艺");
-    //   }
-    // },
-    // // 工艺变更
-    // processFlowIdChange(val) {
-    //   console.log(val)
-    //   if (!val) {
-    //     this.form.materialMethod = 1
-    //   }
-    // },
-    submitForm() {
-      Promise.all(this.list.map((ele) => {
-        return orderCreate(ele);
-      })).then((res) => {
-        this.$modal.msgSuccess("操作成功");
-        this.$emit('splitWorkOrderSubmit');
-      });
 
-      // this.$refs['orderAddForm'].validate((valid) => {
+import { getCustomerList } from '@/api/base/customer';
-      //   if (valid) {
+import { parseTime } from '@/utils/ruoyi';
-      //     if (this.form.planStartTime && this.form.planFinishTime) {
+import inputArea from './inputArea.vue';
-      //       if (this.form.planStartTime > this.form.planFinishTime) {
+import selectMember from './selectMember';
-      //         this.$modal.msgError('计划开始时间不能大于结束时间')
+import selectTime from './selectTime';
-      //         return false
+import { publicFormatter } from '@/utils/dict'
-      //       }
+const tableProps = [
-      //     }
+	{
-      //     // console.log(this.form)
+		prop: 'name',
-      //     if (this.isEdit) {
+		label: '订单名称',
-      //       //编辑
+		minWidth: 120,
-      //       orderUpdate({ ...this.form }).then((res) => {
+		showOverflowtooltip: true,
-      //         if (res.code === 0) {
+		subcomponent: inputArea,
-      //           this.$modal.msgSuccess("操作成功");
+	},
-      //           this.$emit('successSubmit')
+	{
-      //         }
+		prop: 'code',
-      //       })
+		label: '订单编码',
-      //     } else {
+		minWidth: 180,
-      //       this.form.status = 1
+	},
-      //       this.form.triggerOrigin = 1
+	{
-      //       orderCreate({ ...this.form }).then((res) => {
+		prop: 'productName',
-      //         if (res.code === 0) {
+		label: '产品',
-      //           this.$modal.msgSuccess("操作成功");
+		showOverflowtooltip: true,
-      //           this.$emit('successSubmit')
+	},
-      //         }
+	{
-      //       })
+		prop: 'productSpec',
-      //     }
+		label: '产品规格',
-      //   } else {
+		showOverflowtooltip: true,
-      //     return false
+	},
-      //   }
+	{
-      // })
+		prop: 'planQuantity',
-    },
+		label: '计划加工量',
-    formClear() {
+		width: 100,
-      this.$refs.orderAddForm.resetFields()
+		subcomponent: inputArea,
-    }
+	},
-  }
+	{
-}
+		prop: 'deliveTime',
+		label: '交货日期',
+		filter: parseTime,
+		minWidth: 160,
+		subcomponent: selectTime,
+	},
+	{
+		prop: 'customerName',
+		label: '客户',
+		showOverflowtooltip: true,
+		// subcomponent: selectMember,
+	},
+	{
+		prop: 'packSpec',
+		label: '包装规格',
+		width: 100,
+    filter: publicFormatter('pack_spec')
+		// subcomponent: selectMember,
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+		width: 100,
+		subcomponent: inputArea,
+	},
+];
+export default {
+	name: 'OrderAdd',
+	data() {
+		return {
+			tableProps,
+			list: [],
+			tableH: this.tableHeight(260),
+			form: {
+				id: '',
+				name: '',
+				code: '',
+				planQuantity: '',
+				planProductId: '',
+				customerId: '',
+				attr3: undefined,
+				packSpec: '',
+				workers: '',
+				materialMethod: 1,
+				remark: '',
+				deliveTime: undefined,
+				// description: '',
+				planStartTime: '',
+			},
+			rules: {
+				attr3: [
+					{ required: true, message: '拆分数量不能为空', trigger: 'blur' },
+				],
+			},
+			productList: [],
+			customerList: [],
+			processFlowList: [],
+			isEdit: false, //是否是编辑
+		};
+	},
+	created() {
+		window.addEventListener('resize', () => {
+			this.tableH = this.tableHeight(260);
+		});
+	},
+	methods: {
+		handleSplit() {
+			if (this.form.attr3) {
+				this.list = [];
+				let obj = {
+					attr3: this.form.attr3,
+					id: this.form.id,
+				};
+				orderSplit(obj).then((res) => {
+					this.list = res.data;
+					this.list.forEach((item, index) => {
+						item.name = item.name + '-' + (index + 1);
+						item.code = item.code + '-' + (index + 1);
+					});
+				});
+			} else {
+				this.$message('拆分数量不能为空');
+			}
+		},
+		init(obj) {
+			this.getList();
+			// if (obj) {
+			this.isEdit = true;
+			this.form = {};
+			this.list = [];
+			this.form.id = obj.id;
+			//   getOrderById({id: this.form.id}).then(res => {
+			//     if (res.code === 0) {
+			//       this.form.name = res.data.name
+			//       this.form.code = res.data.code
+			//       this.form.planQuantity = res.data.planQuantity
+			//       this.form.planProductId = res.data.planProductId
+			//       this.form.customerId = res.data.customerId
+			//       this.form.planStartTime = res.data.planStartTime ? res.data.planStartTime : null
+			//       this.form.packSpec = res.data.packSpec ? res.data.packSpec+'' : ''
+			//       this.form.workers = res.data.workers
+			//       this.form.processFlowId = res.data.processFlowId
+			//       this.form.materialMethod = res.data.materialMethod
+			//       this.form.planFinishTime = res.data.planFinishTime ? res.data.planFinishTime : null
+			//       this.form.remark = res.data.remark
+			//       // this.form.description = res.data.description
+			//     }
+			//   })
+			// } else {
+			//   this.isEdit = false
+			//   this.form.id = ''
+			//   // 订单号
+			//   getOrderCode().then(res => {
+			//     this.form.code = res.data || ''
+			//   })
+			// }
+		},
+		getList() {
+			// 产品
+			// getProductAll().then(res => {
+			//   this.productList = res.data || []
+			// })
+			// 客户
+			getCustomerList().then((res) => {
+				this.customerList = res.data || [];
+				this.$set(this.tableProps[6], 'customerList', this.customerList);
+			});
+			// 工艺
+			// getProcessFlowList().then(res => {
+			//   this.processFlowList = res.data || []
+			// })
+		},
+		// timeChange() {
+		//   if (this.form.planStartTime && this.form.planFinishTime) {
+		//     if (this.form.planStartTime > this.form.planFinishTime) {
+		//       this.$modal.msgError('计划开始时间不能大于结束时间')
+		//     }
+		//   }
+		// },
+		// // 工艺变更
+		// materialMethodChange(val) {
+		//   if (val === 2 && !this.form.processFlowId) {
+		//     this.form.materialMethod = 1
+		//     this.$modal.msgError("请先选择关联工艺");
+		//   }
+		// },
+		// // 工艺变更
+		// processFlowIdChange(val) {
+		//   console.log(val)
+		//   if (!val) {
+		//     this.form.materialMethod = 1
+		//   }
+		// },
+		inputChange(data) {
+			switch (data.sType) {
+				case 1:
+					this.list[data._pageIndex - 1][data.prop] = data[data.prop];
+					break;
+				case 2:
+					this.list[data._pageIndex - 1][data.prop] = data[data.prop];
+					break;
+				case 3:
+					this.list[data._pageIndex - 1][data.prop] = data.deliveTime;
+					break;
+				default:
+					console.log(val);
+			}
+		},
+		submitForm() {
+			Promise.all(
+				this.list.map((ele) => {
+					return orderCreate(ele);
+				})
+			).then((res) => {
+				this.$modal.msgSuccess('操作成功');
+				this.$emit('splitWorkOrderSubmit');
+			});
+
+			// this.$refs['orderAddForm'].validate((valid) => {
+			//   if (valid) {
+			//     if (this.form.planStartTime && this.form.planFinishTime) {
+			//       if (this.form.planStartTime > this.form.planFinishTime) {
+			//         this.$modal.msgError('计划开始时间不能大于结束时间')
+			//         return false
+			//       }
+			//     }
+			//     // console.log(this.form)
+			//     if (this.isEdit) {
+			//       //编辑
+			//       orderUpdate({ ...this.form }).then((res) => {
+			//         if (res.code === 0) {
+			//           this.$modal.msgSuccess("操作成功");
+			//           this.$emit('successSubmit')
+			//         }
+			//       })
+			//     } else {
+			//       this.form.status = 1
+			//       this.form.triggerOrigin = 1
+			//       orderCreate({ ...this.form }).then((res) => {
+			//         if (res.code === 0) {
+			//           this.$modal.msgSuccess("操作成功");
+			//           this.$emit('successSubmit')
+			//         }
+			//       })
+			//     }
+			//   } else {
+			//     return false
+			//   }
+			// })
+		},
+		formClear() {
+			this.$refs.orderAddForm.resetFields();
+		},
+	},
+};
 </script>

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

@@ -0,0 +1,51 @@
+<template>
+	<div class="tableInner">
+		<el-select
+			v-model="list[list.prop]"
+			@change="changeInput">
+			<el-option
+				v-for="item in list.prop === 'packSpec'
+					? getDictDatas(DICT_TYPE.PACK_SPEC)
+					: list.customerList"
+				:key="list.prop === 'packSpec' ? item.value : item.id"
+				:label="list.prop === 'packSpec' ? item.label : item.name"
+				:value="
+					list.prop === 'packSpec' ? parseInt(item.value) : item.id
+				"></el-option>
+		</el-select>
+	</div>
+</template>
+<script>
+export default {
+	name: 'InputArea',
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+		itemProp: {
+			type: String,
+		},
+	},
+	data() {
+		return {
+			list: this.injectData,
+		};
+	},
+	created() {
+	},
+	methods: {
+		changeInput() {
+			this.list.sType = 2;
+			this.$emit('emitData', this.list);
+		},
+	},
+};
+</script>
+<style scoped>
+.tableInner .el-input__inner {
+	border: none;
+	padding: 0;
+	height: 33px;
+}
+</style>

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

@@ -0,0 +1,47 @@
+<template>
+  <div class="tableInner">
+    <el-date-picker
+     @change="changeInput"
+      v-model="list.deliveTime"
+      type="datetime"
+      size="mini"
+      :style="{width:'100%'}"
+      format='yyyy-MM-dd'
+      value-format="timestamp"
+      prefix-icon="none"
+      placeholder="选择日期">
+    </el-date-picker>
+  </div>
+</template>
+<script>
+export default {
+  name: "InputArea",
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({}),
+    },
+    itemProp: {
+      type: String,
+    },
+  },
+  data() {
+    return {
+      list: this.injectData,
+    };
+  },
+  methods: {
+    changeInput() {
+      this.list.sType = 3
+      this.$emit("emitData", this.list);
+    },
+  },
+};
+</script>
+<style scoped>
+.tableInner .el-input__inner {
+  border: none;
+  padding: 0;
+  height: 33px;
+}
+</style>

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

@@ -1,357 +1,445 @@
 <template>
-  <div class="orderDetailData">
+	<div class="orderDetailData">
-    <div class="box1">
+		<div class="box1">
-      <div class="boxTitle">
+			<div class="boxTitle">
-        <span class="blueTitle"></span>
+				<span class="blueTitle"></span>
-        <span>订单编码: {{orderMsg.code}}</span>
+				<span>订单编码: {{ orderMsg.code }}</span>
-      </div>
+			</div>
-      <el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage">
+			<el-button
-        <svg-icon icon-class="return" /> 返回
+				type="primary"
-      </el-button>
+				plain
-      <div style="padding-left: 14px;">
+				size="small"
-        <el-row>
+				style="float: right; margin-top: -25px"
-          <el-col :span='3'>
+				@click="returnOrderManage">
-            <div class="blodTip">订单名</div>
+				<svg-icon icon-class="return" />
-            <div class="lightTip">{{orderMsg.name}}</div>
+				返回
-          </el-col>
+			</el-button>
-          <el-col :span='3'>
+			<div style="padding-left: 14px; margin-top: 20px">
-            <div class="blodTip">产品信息</div>
+				<el-row>
-            <div class="lightTip">{{orderMsg.productName}}</div>
+					<el-col :span="3">
-          </el-col>
+						<div class="blodTip">订单名</div>
-          <el-col :span='3'>
+						<div class="lightTip">{{ orderMsg.name }}</div>
-            <div class="blodTip">产品规格</div>
+					</el-col>
-            <div class="lightTip">{{orderMsg.specifications}}</div>
+					<el-col :span="3">
-          </el-col>
+						<div class="blodTip">产品名称</div>
-          <el-col :span='3'>
+						<div class="lightTip">{{ orderMsg.productName }}</div>
-            <div class="blodTip">客户</div>
+					</el-col>
-            <div class="lightTip">{{orderMsg.customerName}}</div>
+					<el-col :span="3">
-          </el-col>
+						<div class="blodTip">产品规格</div>
-          <el-col :span='3'>
+						<div class="lightTip">{{ orderMsg.specifications }}</div>
-            <div class="blodTip">包装规格</div>
+					</el-col>
-            <div class="lightTip">{{ getDictDataLabel(DICT_TYPE.PACK_SPEC, orderMsg.packSpec)}}</div>
+					<el-col :span="3">
-          </el-col>
+						<div class="blodTip">客户</div>
-          <!-- <el-col :span='3'>
+						<div class="lightTip">{{ orderMsg.customerName }}</div>
-            <div class="blodTip">物料计算方式</div>
+					</el-col>
-            <div class="lightTip">{{orderMsg.materialMethod ? (orderMsg.materialMethod === 1 ? '产品基础' : '工艺扩展') : ''}}
+					<el-col :span="3">
-            </div>
+						<div class="blodTip">包装规格</div>
-          </el-col> -->
+						<div class="lightTip">
-          <el-col :span='3'>
+							{{ getDictDataLabel(DICT_TYPE.PACK_SPEC, orderMsg.packSpec) }}
-            <div class="blodTip">创建时间</div>
+						</div>
-            <div class="lightTip">{{ parseTime(orderMsg.createTime) }}</div>
+					</el-col>
-          </el-col>
+					<el-col :span="3">
-          <el-col :span='3'>
+						<div class="blodTip">物料计算方式</div>
-            <div class="blodTip">计划开始时间</div>
+						<div class="lightTip">
-            <div class="lightTip">{{ parseTime(orderMsg.planStartTime) }}</div>
+							{{
-          </el-col>
+								orderMsg.materialMethod
-        </el-row>
+									? orderMsg.materialMethod === 1
-        <el-row>
+										? '产品基础'
-          <el-col :span='3'>
+										: '工艺扩展'
-            <div class="blodTip">计划完成时间</div>
+									: ''
-            <div class="lightTip">{{ parseTime(orderMsg.planFinishTime) }}</div>
+							}}
-          </el-col>
+						</div>
-          <el-col :span='3'>
+					</el-col>
-            <div class="blodTip">计划加工数量</div>
+					<!-- <el-col :span="3">
-            <div class="lightTip">{{orderMsg.planQuantity}}</div>
+						<div class="blodTip">计划开始时间</div>
-          </el-col>
+						<div class="lightTip">{{ parseTime(orderMsg.planStartTime) }}</div>
-          <el-col :span='3'>
+					</el-col> -->
-            <div class="blodTip">加工平方数(平方米)</div>
+				</el-row>
-            <div class="lightTip">{{orderMsg.planArea}}</div>
+				<el-row>
-          </el-col>
+					<el-col :span="3">
-          <el-col :span='3'>
+						<div class="blodTip">创建时间</div>
-            <div class="blodTip">预计用时(时)</div>
+						<div class="lightTip">{{ parseTime(orderMsg.createTime) }}</div>
-            <div class="lightTip">{{ orderMsg.expectTime }}</div>
+					</el-col>
-          </el-col>
+					<el-col :span="3">
-          <el-col :span='3'>
+						<div class="blodTip">交货时间</div>
-            <div class="blodTip">状态</div>
+						<div class="lightTip">{{ parseTime(orderMsg.deliveTime) }}</div>
-            <div class="lightTip">{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderMsg.status)}}</div>
+					</el-col>
-          </el-col>
+					<!-- <el-col :span="3">
-          <el-col :span='3'>
+						<div class="blodTip">计划完成时间</div>
-            <div class="blodTip">实际开始时间</div>
+						<div class="lightTip">{{ parseTime(orderMsg.planFinishTime) }}</div>
-            <div class="lightTip">{{ parseTime(orderMsg.startProduceTime) }}</div>
+					</el-col> -->
-          </el-col>
+					<el-col :span="3">
-          <el-col :span='3'>
+						<div class="blodTip">计划加工数量</div>
-            <div class="blodTip">实际完成时间</div>
+						<div class="lightTip">{{ orderMsg.planQuantity }}</div>
-            <div class="lightTip">{{ parseTime(orderMsg.finishProduceTime) }}</div>
+					</el-col>
-          </el-col>
+					<!-- <el-col :span="3">
-          <el-col :span='3'>
+						<div class="blodTip">加工平方数(平方米)</div>
-            <div class="blodTip">实际生产数量</div>
+						<div class="lightTip">{{ orderMsg.planArea }}</div>
-            <div class="lightTip">{{orderMsg.actualQuantity }}</div>
+					</el-col>
-          </el-col>
+					<el-col :span="3">
-        </el-row>
+						<div class="blodTip">预计用时(时)</div>
-        <el-row>
+						<div class="lightTip">{{ orderMsg.expectTime }}</div>
-          <el-col :span='3'>
+					</el-col> -->
-            <div class="blodTip">完成比%</div>
+					<el-col :span="3">
-            <div class="lightTip">{{orderMsg.completeProp}}</div>
+						<div class="blodTip">状态</div>
-          </el-col>
+						<div class="lightTip">
-          <el-col :span='3'>
+							{{ getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderMsg.status) }}
-            <div class="blodTip">废片数量</div>
+						</div>
-            <div class="lightTip">{{orderMsg.nokQuantity}}</div>
+					</el-col>
-          </el-col>
+					<el-col :span="3">
-          <el-col :span='3'>
+						<div class="blodTip">实际开始时间</div>
-            <div class="blodTip">负责人</div>
+						<div class="lightTip">
-            <div class="lightTip">{{orderMsg.workers}}</div>
+							{{ parseTime(orderMsg.startProduceTime) }}
-          </el-col>
+						</div>
-          <!-- <el-col :span='3'>
+					</el-col>
+					<el-col :span="3">
+						<div class="blodTip">实际完成时间</div>
+						<div class="lightTip">
+							{{ parseTime(orderMsg.finishProduceTime) }}
+						</div>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="3">
+						<div class="blodTip">实际生产数量</div>
+						<div class="lightTip">{{ orderMsg.actualQuantity }}</div>
+					</el-col>
+					<el-col :span="3">
+						<div class="blodTip">完成比%</div>
+						<div class="lightTip">{{ orderMsg.completeProp }}</div>
+					</el-col>
+					<el-col :span="3">
+						<div class="blodTip">废片数量</div>
+						<div class="lightTip">{{ orderMsg.nokQuantity }}</div>
+					</el-col>
+					<el-col :span="3">
+						<div class="blodTip">备注</div>
+						<div class="lightTip">{{ orderMsg.remark }}</div>
+					</el-col>
+					<!-- <el-col :span='3'>
             <div class="blodTip">关联工艺</div>
             <div class="lightTip">{{processFlowName}}</div>
           </el-col> -->
-        </el-row>
+				</el-row>
-      </div>
+			</div>
-    </div>
+		</div>
-    <div class="box2">
+		<div class="box2">
-      <!-- <div class="boxTitle">
+			<!-- <div class="boxTitle">
         <span class="blueTitle"></span>
         <span>工单信息</span>
       </div> -->
-      <div class="toggleTabBox">
+			<div class="toggleTabBox">
-        <div :class="{ active: activeModule === 'orderInfo' }" @click="toggleTab('orderInfo')">子订单信息</div>
+				<div
-        <!-- <div :class="{ active: activeModule === 'useInfo' }" @click="toggleTab('useInfo')">用料信息</div> -->
+					:class="{ active: activeModule === 'orderInfo' }"
-      </div>
+					@click="toggleTab('orderInfo')">
-      <!-- 列表 -->
+					子订单信息
-      <el-row v-show="activeModule === 'orderInfo'">
+				</div>
-        <el-col :span="6">
+				<div
-          <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+					:class="{ active: activeModule === 'useInfo' }"
-        </el-col>
+					@click="toggleTab('useInfo')">
-        <el-col :span="18">
+					用料信息
-          <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps1"
+				</div>
-            :table-data="list1" :max-height="tableH" />
+			</div>
-        </el-col>
+			<!-- 列表 -->
-      </el-row>
+			<el-row v-show="activeModule === 'orderInfo'">
-      <!-- <base-table v-show="activeModule === 'useInfo'" :page="queryParams.pageNo" :limit="queryParams.pageSize"
+				<el-col :span="6">
-        :table-props="tableProps2" :table-data="list2" :max-height="tableH" /> -->
+					<el-tree
-    </div>
+						:data="treeData"
-  </div>
+						:props="defaultProps"
+						default-expand-all
+						@node-click="handleNodeClick"></el-tree>
+				</el-col>
+				<el-col :span="18">
+					<base-table
+						:page="queryParams.pageNo"
+						:limit="queryParams.pageSize"
+						:table-props="tableProps1"
+						:table-data="list1"
+						:max-height="tableH" />
+				</el-col>
+			</el-row>
+			<base-table
+				v-show="activeModule === 'useInfo'"
+				:page="queryParams.pageNo"
+				:limit="queryParams.pageSize"
+				:table-props="tableProps2"
+				:table-data="list2"
+				:max-height="tableH" />
+		</div>
+	</div>
 </template>
 <script>
-import { parseTime } from '@/utils/ruoyi'
+import { parseTime } from '@/utils/ruoyi';
-import { publicFormatter } from '@/utils/dict'
+import { publicFormatter } from '@/utils/dict';
-import { getProcessFlowList } from '@/api/base/orderManage'
+import {
-import { orderDetail, bomUseNum, getDetailTree, getDetailTreeInfo } from '@/api/base/orderManage'
+	getProcessFlowList,
+	getOrderRemainNum,
+	getMaterialCostOrder,
+} from '@/api/base/orderManage';
+import {
+	orderDetail,
+	bomUseNum,
+	getDetailTree,
+	getDetailTreeInfo,
+} from '@/api/base/orderManage';
 const tableProps1 = [
-  {
+	{
-    prop: 'issueTime',
+		prop: 'issueTime',
-    label: '下发时间',
+		label: '下发时间',
-    filter: parseTime,
+		filter: parseTime,
-    minWidth: 160
+		minWidth: 160,
-  },
+	},
-  {
+	{
-    prop: 'name',
+		prop: 'type',
-    label: '工单名',
+		label: '订单/工单类型',
-    minWidth: 100,
+		minWidth: 140,
-    showOverflowtooltip: true
+		showOverflowtooltip: true,
-  },
+    sortable:true
-  {
+	},
-    prop: 'code',
+	{
-    label: '工单编码',
+		prop: 'name',
-    minWidth: 150
+		label: '订单/工单名',
-  },
+		minWidth: 100,
-  {
+		showOverflowtooltip: true,
-    prop: 'planAssignmentQuantity',
+	},
-    label: '计划加工量',
+	{
-    width: 100
+		prop: 'code',
-  },
+		label: '订单/工单编码',
-  {
+		minWidth: 165,
-    prop: 'actualQuantity',
+	},
-    label: '实际加工量',
+	{
-    width: 100
+		prop: 'planAssignmentQuantity',
-  },
+		label: '计划加工量',
-  {
+		width: 100,
-    prop: 'actualArea',
+	},
-    label: '加工平方数',
+	{
-    width: 100
+		prop: 'actualQuantity',
-  },
+		label: '实际加工量',
-  {
+		width: 100,
-    prop: 'status',
+	},
-    label: '状态',
+	// {
-    filter: publicFormatter('order_status')
+	// 	prop: 'actualArea',
-  },
+	// 	label: '加工平方数',
-  {
+	// 	width: 100,
-    prop: 'startProduceTime',
+	// },
-    label: '开始时间',
+	{
-    filter: parseTime,
+		prop: 'status',
-    minWidth: 160
+		label: '状态',
-  },
+		filter: publicFormatter('order_status'),
-  {
+	},
-    prop: 'finishProduceTime',
+	{
-    label: '结束时间',
+		prop: 'startProduceTime',
-    filter: parseTime,
+		label: '开始时间',
-    minWidth: 160
+		filter: parseTime,
-  },
+		minWidth: 160,
-  {
+	},
-    prop: 'productLineNames',
+	{
-    label: '关联产线',
+		prop: 'finishProduceTime',
-    filter: (val) => val ? val.join(',') : '',
+		label: '结束时间',
-    showOverflowtooltip: true
+		filter: parseTime,
-  },
+		minWidth: 160,
-  {
+	},
-    prop: 'workers',
+	{
-    label: '负责人'
+		prop: 'productLineNames',
-  },
+		label: '关联产线',
-  {
+		filter: (val) => (val ? val.join(',') : ''),
-    prop: 'remark',
+		showOverflowtooltip: true,
-    label: '备注'
+	},
-  }
+	{
-]
+		prop: 'remark',
+		label: '备注',
+	},
+];
 const tableProps2 = [
-  {
+	{
-    prop: 'materialName',
+		prop: 'materialName',
-    label: '物料名称'
+		label: '物料名称',
-  },
+	},
-  {
+	{
-    prop: 'unit',
+		prop: 'unit',
-    label: '单位',
+		label: '单位',
-    filter: publicFormatter('unit_dict')
+		filter: publicFormatter('unit_dict'),
-  },
+	},
-  {
+	{
-    prop: 'num',
+		prop: 'num',
-    label: '剩余生产预计消耗'
+		label: '剩余生产预计消耗',
-  }
+	},
-]
+];
 export default {
-  name: 'OrderDetailData',
+	name: 'OrderDetailData',
-  data() {
+	data() {
-    return {
+		return {
-      orderId: '',
+			orderId: '',
-      tableProps1,
+			tableProps1,
-      treeData:undefined,
+			treeData: undefined,
-      activeModule:'orderInfo',
+			activeModule: 'orderInfo',
-      tableProps2,
+			tableProps2,
-      list1: [],
+			list1: [],
-      list2: [],
+			list2: [],
-      tableH: this.tableHeight(510) / 2,
+			tableH: this.tableHeight(510) / 2,
-      // 查询参数
+			// 查询参数
-      queryParams: {
+			queryParams: {
-        pageNo: 1,
+				pageNo: 1,
-        pageSize: 500
+				pageSize: 500,
-      },
+			},
-      defaultProps: {
+			defaultProps: {
-        children: 'children',
+				children: 'children',
-        label: 'name'
+				label: 'name',
-      },
+			},
-      orderMsg: {},
+			orderMsg: {},
-      processFlowName: ''
+			processFlowName: '',
-    }
+		};
-  },
+	},
-  mounted() {
+	activated() {
-    window.addEventListener('resize', () => {
+		window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(510) / 2
+			this.tableH = this.tableHeight(510) / 2;
-    })
+		});
-    this.orderId = location.href.split('?')[1].split('=')[1]
+		this.orderId = location.href.split('=')[1];
-    this.getMsg()
+		this.getMsg();
-  },
+	},
-  watch: {
+	watch: {
-    $route: 'initData'
+		$route: 'initData',
-  },
+	},
-  methods: {
+	methods: {
-    toggleTab(val) {
+		toggleTab(val) {
-      this.activeModule = val
+			this.activeModule = val;
-    },
+		},
-    handleNodeClick(val) {
+		handleNodeClick(val) {
-      console.log(val)
+			getDetailTreeInfo({
-      getDetailTreeInfo({
+				id: val.id,
-        id: val.id
+			}).then((res) => {
-      }).then(res => {
+				this.list1 = res.data;
-        this.list1 = res.data.order
+			});
-        console.log(res)
+		},
-      })
+		initData(to) {
-    },
+			if (to.name === 'OrderDetailData') {
-    initData(to) {
+				this.orderId = location.href.split('=')[1];
-      if (to.name === 'OrderDetailData') {
+				this.getMsg();
-        this.orderId = location.href.split('?')[1].split('=')[1]
+			}
-        this.getMsg()
+		},
-      }
+		getMsg() {
-    },
+			orderDetail({
-    getMsg() {
+				id: this.orderId,
-      orderDetail({
+			}).then((res) => {
-        id: this.orderId
+				this.orderMsg = res.data;
-      }).then(res => {
+
-        this.orderMsg = res.data
+				getOrderRemainNum(this.orderId).then((resNum) => {
-        this.list1 = res.data.coreWorkOrderRespVOS
+					bomUseNum({
-        bomUseNum({
+						productId: this.orderMsg.planProductId,
-          productId: this.orderMsg.planProductId
+					}).then((res2) => {
-        }).then(res2 => {
+						if (res2.data && res2.data.length > 0) {
-          if (res2.data && res2.data.length > 0) {
+							let arr = res2.data;
-            let arr = res2.data
+							arr.map((item) => {
-            arr.map(item => {
+								if (item) {
-              if (item) {
+									let a = item.num * resNum.data;
-                let a = item.num * this.orderMsg.remainingQuantity
+									item.num = !isNaN(parseFloat(a)) && isFinite(a) ? a : '';
-                item.num = !isNaN(parseFloat(a)) && isFinite(a) ? a : ''
+								}
-              }
+							});
-            })
+							this.list2 = arr;
-            this.list2 = arr
+							this.getMaterialCostOrder(this.orderId);
-          }else {
+						} else {
-            this.list2 = []
+							this.list2 = [];
-          }
+						}
-        })
+					});
-        getDetailTree({
+				});
-          id: this.orderId
+
-        }).then(res => {
+				getDetailTreeInfo({
-          console.log(res)
+					id: this.orderId,
-          this.treeData =res.data
+				}).then((res) => {
+					this.list1 = res.data;
+				});
+				getDetailTree({
+					id: this.orderId,
+				}).then((res) => {
+					this.treeData = res.data;
+          this.treeData.unshift({
+            id:this.orderId,
+            name:'全部'
           })
-        // 工艺
+				});
-        getProcessFlowList().then(res => {
+				// 工艺
-          let arr = res.data || []
+				getProcessFlowList().then((res) => {
-          if (arr.length > 0) {
+					let arr = res.data || [];
-            arr.map(item => {
+					if (arr.length > 0) {
-              if (item.id === this.orderMsg.processFlowId) {
+						arr.map((item) => {
-                this.processFlowName = item.name
+							if (item.id === this.orderMsg.processFlowId) {
-              }
+								this.processFlowName = item.name;
-            })
+							}
-          }
+						});
-        })
+					}
-      })
+				});
-    },
+			});
-    // 返回
+		},
-    returnOrderManage() {
+		getMaterialCostOrder(id) {
-      this.$router.go(-1);
+			getMaterialCostOrder({ id }).then((res) => {
-    }
+				this.list2.push(...res.data);
-  }
+			});
-}
+		},
+		// 返回
+		returnOrderManage() {
+			this.$router.go(-1);
+		},
+	},
+};
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .orderDetailData {
-  background-color: rgb(242, 244, 249);
+	background-color: rgb(242, 244, 249);
-  .box1, .box2, .box3 {
+	.box1,
-    background-color: #fff;
+	.box2,
-    border-radius: 9px;
+	.box3 {
-  }
+		background-color: #fff;
-  .box2 {
+		border-radius: 9px;
-    height: calc((100vh - 360px));
+	}
-    padding: 12px 16px 0;
+	.box2 {
-    margin: 8px 0;
+		height: calc((100vh - 360px));
-    .toggleTabBox {
+		padding: 12px 16px 0;
-        display: inline-block;
+		margin: 8px 0;
-        div {
+		.toggleTabBox {
-          display: inline-block;
+			display: inline-block;
-          padding: 0 8px 4px;
+			div {
-          color: rgba(102, 102, 102, 0.5);
+				display: inline-block;
-          border-bottom: 2px solid rgba(242, 244, 249, 1);
+				padding: 0 8px 4px;
-          cursor: pointer;
+				color: rgba(102, 102, 102, 0.5);
-        }
+				border-bottom: 2px solid rgba(242, 244, 249, 1);
-        .active {
+				cursor: pointer;
-          color: rgba(0, 0, 0, 0.85);
+			}
-          border-bottom-color: #0B58FF;
+			.active {
-        }
+				color: rgba(0, 0, 0, 0.85);
-      }
+				border-bottom-color: #0b58ff;
-  }
+			}
-  .box1 {
+		}
-    height: 215px;
+	}
-    padding: 16px 16px 0 16px;
+	.box1 {
-    .blodTip {
+		height: 215px;
-      height: 16px;
+		padding: 16px 16px 0 16px;
-      font-size: 14px;
+		.boxTitle {
-      font-weight: 600;
+			font-size: 16px;
-      color: rgba(0,0,0,0.85);
+			font-weight: 600;
-      margin-bottom: 8px;
+		}
-    }
+		.blueTitle {
-    .lightTip {
+			display: inline-block;
-      height: 16px;
+			width: 4px;
-      font-size: 14px;
+			height: 18px;
-      font-weight: 400;
+			background-color: #0b58ff;
-      color: rgba(102,102,102,0.75);
+			margin-right: 8px;
-      margin-bottom: 12px;
+			position: relative;
-    }
+			top:4px;
-  }
+		}
+		.blodTip {
+			height: 16px;
+			font-size: 14px;
+			font-weight: 600;
+			color: rgba(0, 0, 0, 0.85);
+			margin-bottom: 8px;
+		}
+		.lightTip {
+			height: 16px;
+			font-size: 14px;
+			font-weight: 400;
+			color: rgba(102, 102, 102, 0.75);
+			margin-bottom: 12px;
+		}
+	}
 }
 </style>

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: [