工艺模型修改

src/api/masterDataManagement/process/processoperation.js

@@ -228,7 +228,7 @@ export function gProcessRouteSelect() {
 //工序
 export function gProcessSelect(routingcode) {
     return request({
-        url: `MasterDataManagement/Process/ProcessOperation/SelectOperation?routingCode=${routingcode}`,
+        url: `MasterDataManagement/Process/ProcessOperationWorkstationMapping/SelectOperation?routingCode=${routingcode}`,
         method: 'get',
     })
 }

src/api/masterDataManagement/process/processoperationworkstationmapping.js

@@ -55,3 +55,36 @@ export function delProcessOperationWorkstationMapping(pid) {
         method: 'delete'
     })
 }
+
+//工厂下拉
+export function getPlantSelect() {
+    return request({
+        url: 'MasterDataManagement/Process/ProcessOperationWorkstationMapping/get_factory_site',
+        method: 'get'
+    })
+}
+
+//车间
+export function getPlantWorkshopSelect(site_code) {
+    return request({
+        url: `MasterDataManagement/Process/ProcessOperationWorkstationMapping/get_workshop?site_code=${site_code}`,
+        method: 'get',
+    })
+}
+//产线
+export function getPlantProductlineSelect(data) {
+    return request({
+        url: `MasterDataManagement/Process/ProcessOperationWorkstationMapping/get_productlinebody`,
+        method: 'get',
+        params: data
+    })
+}
+
+//工站
+export function getPlantWorkstationSelect(data) {
+    return request({
+        url: `MasterDataManagement/Process/ProcessOperationWorkstationMapping/get_workstation_list`,
+        method: 'get',
+        params: data
+    })
+}

src/views/masterDataManagement/Process/ProcessOperationWorkstationMapping.vue

@@ -72,40 +72,42 @@
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
         <el-row :gutter="20">
           <el-col :lg="12">
-            <el-form-item label="工艺路线" prop="name">
-              <el-select @change="handleRoutingCodeChange" v-model="form.name" placeholder="请选择" style="width: 100%">
+            <el-form-item label="工艺路线" prop="fkRoutingCode">
+              <el-select @change="handleRoutingCodeChange" v-model="form.fkRoutingCode" placeholder="请选择"
+                style="width: 100%">
                 <el-option v-for="item in processRouteSelect" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :lg="12">
-            <el-form-item label="工序" prop="workstation">
-              <el-select v-model="form.workstation" placeholder="请选择" style="width: 100%">
+            <el-form-item label="工序" prop="fkOperationCode">
+              <el-select v-model="form.fkOperationCode" placeholder="请选择" style="width: 100%">
                 <el-option v-for="item in processSelect" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :lg="12">
-            <el-form-item label="工厂" prop="workstation">
-              <el-select v-model="form.workstation" placeholder="请选择" style="width: 100%">
+            <el-form-item label="工厂" prop="factory">
+              <el-select @change="factoryChange" v-model="form.factory" placeholder="请选择" style="width: 100%">
                 <el-option v-for="item in workstationSelect" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :lg="12">
-            <el-form-item label="车间" prop="workstation">
-              <el-select v-model="form.workstation" placeholder="请选择" style="width: 100%">
+            <el-form-item label="车间" prop="workshop">
+              <el-select @change="handleWorkshop" v-model="form.workshop" placeholder="请选择" style="width: 100%">
                 <el-option v-for="item in workshopSelect" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :lg="12">
-            <el-form-item label="产线" prop="workstation">
-              <el-select v-model="form.workstation" placeholder="请选择" style="width: 100%">
+            <el-form-item label="产线" prop="fkProductlinebodyCode">
+              <el-select @change="handleProductlineChange" v-model="form.fkProductlinebodyCode" placeholder="请选择"
+                style="width: 100%">
                 <el-option v-for="item in productionLineSelect" :key="item.value" :label="item.label"
                   :value="item.value">
                 </el-option>
@@ -113,8 +115,8 @@
             </el-form-item>
           </el-col>
           <el-col :lg="12">
-            <el-form-item label="工站" prop="workstation">
-              <el-select v-model="form.workstation" placeholder="请选择" style="width: 100%">
+            <el-form-item label="工站" prop="fkWorkstationCode">
+              <el-select v-model="form.fkWorkstationCode" placeholder="请选择" style="width: 100%">
                 <el-option v-for="item in workstationNameSelect" :key="item.value" :label="item.label"
                   :value="item.value">
                 </el-option>
@@ -122,21 +124,17 @@
             </el-form-item>
           </el-col>
 
-          <el-col :lg="12">
+          <!-- <el-col :lg="12">
             <el-form-item label="工序编码" prop="fkOperationCode">
               <el-input v-model="form.fkOperationCode" placeholder="请输入工序编码" />
             </el-form-item>
-          </el-col>
-          <el-col :lg="12">
+          </el-col> -->
+          <!-- <el-col :lg="12">
             <el-form-item label="产线" prop="fkProductlinebodyCode">
               <el-input v-model="form.fkProductlinebodyCode" placeholder="请输入产线" />
             </el-form-item>
-          </el-col>
-          <el-col :lg="12">
-            <el-form-item label="工位号" prop="fkWorkstationCode">
-              <el-input v-model="form.fkWorkstationCode" placeholder="请输入工位号" />
-            </el-form-item>
-          </el-col>
+          </el-col> -->
+
 
           <el-col :lg="12">
             <el-form-item label="是否有效" prop="isActive">
@@ -346,6 +344,11 @@ import {
   listProcessOperationWorkstationMapping,
   addProcessOperationWorkstationMapping, delProcessOperationWorkstationMapping,
   updateProcessOperationWorkstationMapping, getProcessOperationWorkstationMapping,
+  getPlantSelect,
+  getPlantWorkshopSelect,
+  getPlantProductlineSelect,
+  getPlantWorkstationSelect,
+
 }
   from '@/api/masterDataManagement/process/processoperationworkstationmapping.js'
 import {
@@ -784,16 +787,83 @@ function gProcessRouteSelectData() {
   });
 }
 
+
 function handleRoutingCodeChange(val) {
   gProcessSelect(val).then((res) => {
     processSelect.value = res.data.map(item => {
       return {
-        label: item.processName,
-        value: item.processCode,
+        label: item.operationName,
+        value: item.operationCode,
       };
     })
   });
 }
+//工厂下拉
+const workshopCode = ref('');
+function factoryChange(val) {
+  workshopCode.value = val;
+  getPlantWorkshopSelect(val).then((res) => {
+    workshopSelect.value = res.data.map(item => {
+      return {
+        label: item.workshopName,
+        value: item.workshopCode,
+      };
+    })
+  });
+}
+//车间下拉
+const workshop = ref('')
+function handleWorkshop(val) {
+  workshop.value = val
+  console.log(val, '车间选择');
+  let data = {
+    site_code: workshopCode.value,
+    workshop_code: workshop.value
+  }
+  console.log(data, '数据');
+  getPlantProductlineSelect(data).then((res) => {
+    if (res.code == 200) {
+      console.log('产线下拉', res);
+      productionLineSelect.value = res.data.map(item => {
+        return {
+          label: item.lineName,
+          value: item.lineCode,
+        }
+      })
+    }
+  })
+}
+function handleProductlineChange(val) {
+  let data = {
+    site_code: workshopCode.value,
+    workshop_code: workshop.value
+  }
+  getPlantWorkstationSelect(data).then(res => {
+    if (res.code == 200) {
+      console.log(res, '工位下拉');
+      workstationNameSelect.value = res.data.map(item => {
+        return {
+          label: item.workstationName,
+          value: item.workstationCode,
+        }
+      })
+    }
+  })
+}
+function getPlantSelectData() {
+  getPlantSelect().then((res) => {
+    console.log(res, '工厂数据');
+    if (res.code == 200) {
+      workstationSelect.value = res.data.map(item => {
+        return {
+          label: item.siteName,
+          value: item.siteCode,
+        };
+      })
+    }
+
+  });
+}
 // 添加按钮操作
 function handleAdd() {
   reset();
@@ -801,6 +871,7 @@ function handleAdd() {
   title.value = '添加'
   opertype.value = 1
   gProcessRouteSelectData()
+  getPlantSelectData()
 }
 function resetForm1() {
   form1.value = {
@@ -877,7 +948,8 @@ function handleUpdate(row) {
       open.value = true
       title.value = '修改'
       opertype.value = 2
-
+      gProcessRouteSelectData()
+      getPlantSelectData()
       form.value = {
         ...data,
         isActive: data.isActive == 'True' ? '1' : '0'