生产管理

src/view/yunyin/shengchanguanli/components/addGongYi.vue

@@ -95,7 +95,7 @@
       <template #footer>
         <div class="dialog-footer" style="text-align: right;top: auto;">
           <el-button @click="add_gdgycloseDialog">取 消</el-button>
-          <el-button type="primary" @click="add_gdgyenterDialog">确 定</el-button>
+          <el-button type="primary" disabled @click="add_gdgyenterDialog">确 定</el-button>
         </div>
       </template>
     </el-dialog>
@@ -139,6 +139,7 @@
 import {ref, reactive} from 'vue'
 import {gdzl_MachineList, PrintDetailList, WastageList,getDepartName, capacityList,
 } from "@/api/yunyin/yunying";
+import { ElMessage } from 'element-plus'
 
 const form = reactive({})
 const visible = ref(false)
@@ -304,60 +305,67 @@ const changeHandle = (v) => {
   form['工序'] = (list.sort((a, b) => b-a)[0] + 1)
   yjdisplay.value = false
 }
-
+const _capacityListsbbh = ref(null)
 const sbbhclick = () => {
   _capacityList();
 }
 
 
 const _capacityList = async () => {
-  if(gdgyformData['设备编号'] === ''){
+  if(form['设备编号'] === ''){
     return false;
   }else{
-    _capacityListsbbh.value = gdgyformData['设备编号'].join(' ');
+    _capacityListsbbh.value = form['设备编号'].join(' ');
     const editProductedit_machine = await capacityList({machine:_capacityListsbbh.value});
-    gdgyformData['小时产能'] = editProductedit_machine.data;
+    form['小时产能'] = editProductedit_machine.data;
   }
 
 };
 
-// //默认弹窗关闭
-// const add_gdgydialogFormVisible = ref(false)
-// const add_gdgyformData = reactive({});
-// //清空对象的属性值
-// const gdgy_clearFormData = () => {
-//   Object.keys(add_gdgyformData).forEach(key => {
-//     add_gdgyformData[key] = '';
-//   });
-// };
-// //新增工艺资料弹窗
-// const addgdgy_onclick = () => {
-//   if(_Gd_gdbh.value == null){
-//     cgugdlist.value = false;
-//     ElMessage({
-//       type: 'warning',
-//       message: '请选择具体的工单后，再操作此功能'
-//     })
-//   }else{
-//     let gongxu = gytableData.value.map(item => {
-//       return item['印件-工序']
-//     })
-//     addGongYiRef.value.open(_Gd_gdbh.value, gongxu)
-//   }
-// }
-// //新增工艺资料确定
-// const add_gdgyenterDialog = async () => {
-//   console.log(add_gdgyformData)
-//   // const formattedData = {
-//   //   Yj_Gdbh: _Gd_gdbh.value,
-//   //   yj_Yjno: add_gdgyformData['yjno'],
-//   //   yj_Yjdh: add_gdgyformData['yjdh'],
-//   // };
-//   // console.log(formattedData)
-//   // const ProcessDetailAdd_add = await ProcessDetailAdd(formattedData);
-//   // console.log(ProcessDetailAdd_add)
-//   // add_gdgydialogFormVisible.value = false
-// }
+const sbbh = ref(null)
+
+//新增工艺资料确定
+const add_gdgyenterDialog = async () => {
+  if(!form['yjno']){
+    ElMessage({ type: 'warning', message: '印件编号不能为空' });return;
+  }
+  if(!form['工序']){
+    ElMessage({ type: 'warning', message: '工序编号不能为空' });return;
+  }
+  if(!form['车间名称']){
+    ElMessage({ type: 'warning', message: '车间名称不能为空' });return;
+  }
+  if(!form['设备编号']){
+    ElMessage({ type: 'warning', message: '设备编号不能为空' });return;
+  }
+  console.log(form)
+  sbbh.value = form['设备编号'].join(' ');
+  const formattedData = {
+    Gy0_gdbh: id.value,
+    Gy0_yjno: form['yjno'] ? form['yjno'] : "",
+    Gy0_gxh: form['工序'] ? form['工序'] : "",
+    重点工序: form['重点工序'] ? form['重点工序'] : "",
+    备选工序: form['备选工序'] ? form['备选工序'] : "",
+    Gy0_ks: form['开数'] ? form['开数'] : "",
+    Gy0_ls: form['联数'] ? form['联数'] : "",
+    车间名称: form['车间名称'] ? form['车间名称'] : "",
+    工艺名称: form['工艺名称'] ? form['工艺名称'] : "",
+    工序名称: form['工序名称'] ? form['工序名称'] : "",
+    计损色数: form['计损色数'] ? form['计损色数'] : "",
+    设备编号: sbbh.value ? sbbh.value : "",
+    工序损耗: form['shdh'] ? form['shdh'] : "",
+    工序损耗名称: form['工序损耗名称'] ? form['工序损耗名称'] : "",
+    装版工时: form['装版工时'] ? form['装版工时'] : "",
+    小时产能: form['小时产能'] ? form['小时产能'] : "",
+    备注: form['备注'] ? form['备注'] : "",
+    质量要求: form['质量要求'] ? form['质量要求'] : "",
+    质量隐患: form['质量隐患'] ? form['质量隐患'] : "",
+  };
+  console.log(formattedData)
+  // const ProcessDetailAdd_add = await ProcessDetailAdd(formattedData);
+  // console.log(ProcessDetailAdd_add)
+  // add_gdgydialogFormVisible.value = false
+}
 // 新增工艺资料取消
 const add_gdgycloseDialog = () => {
   visible.value = false

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -22,7 +22,7 @@
               <el-button type="primary" icon="edit"   @click="addgd_onclick"   class="bt" title="新增工单资料">新增工单资料</el-button>
               <el-button type="primary" icon="edit"   @click="addgdyj_onclick"   class="bt" title="新增印件资料">新增印件资料</el-button>
               <el-button type="primary" icon="edit"   @click="addgdgy_onclick"   class="bt" title="新增工艺资料" >新增工艺资料</el-button>
-              <el-button type="primary" icon="edit"   @click="delgd_delclick"  :disabled="yjSelection === '' && gySelection === ''"  class="bt" title="批量删除（印件资料或工艺资料）"  >删除</el-button>
+              <el-button type="primary" icon="edit"   @click="delgd_delclick"  :disabled="yjSelection === '' && gySelection === ''"  class="bt" title="选择批量删除（印件资料或工艺资料）"  >删除</el-button>
             </el-form-item>
           </el-form>
 
@@ -540,7 +540,7 @@
                           highlight-current-row="true"
                           @row-dblclick="gdbomupdateCompanyFunc"
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
-                  <el-table-column type="selection" width="30" />
+<!--                  <el-table-column type="selection" width="30" />-->
                   <el-table-column align="left" label="方案" prop="方案"  width="120"/>
                   <el-table-column align="left" label="物料编号" prop="物料编号"  width="100"/>
                   <el-table-column align="left" label="物料名称" prop="物料名称"  width="400"/>
@@ -748,10 +748,10 @@
                   </el-row>
                   <el-row :gutter="24">
                     <el-form-item label="印件代码:" prop="customerCode" class="mab" label-width="90">
-                      <el-input v-model="add_gdscgdformData['印件代号']"   style="width: 110px;" id="印件代号"  @keydown="add_gdzlent($event, '产品名称', '印件代号', '印件名称')"/>
+                      <el-input v-model="add_gdscgdformData['印件代号']" disabled  style="width: 110px;" id="印件代号"  @keydown="add_gdzlent($event, '产品名称', '印件代号', '印件名称')"/>
                     </el-form-item>
                     <el-form-item label="印件名称:" prop="customerName" class="mab" label-width="75">
-                      <el-input v-model="add_gdscgdformData['印件名称']"  id="印件名称" style="width: 520px;"  @keydown="add_gdzlent($event, '印件代号', '印件名称', '订单数量')"  />
+                      <el-input v-model="add_gdscgdformData['印件名称']" disabled id="印件名称" style="width: 520px;"  @keydown="add_gdzlent($event, '印件代号', '印件名称', '订单数量')"  />
                     </el-form-item>
                   </el-row>
                   <el-row :gutter="24">
@@ -1846,7 +1846,7 @@ const add_gdcloseDialog = () => {
 const khdhModal = ref(false)
 const cpdhModal = ref(false)
 const khdhDataList = ref([])
-const cpdhDataList = ref()
+const cpdhDataList = ref([])
 const khdh_keyword = ref('')
 const cpdh_keyword = ref('')
 
@@ -2815,11 +2815,13 @@ const type = ref('')
 let scgdformData = ref({})
 //双击修改
 const updateCompanyFunc = async(row) => {
+  console.log(row['工单编号'])
   // if(row['status'] === '*'){
   //   ElMessage({ type: 'warning', message: '未找到该工单印件资料' });
   //   return false;
   // }else{
-    const DataCorrection_list = await DataCorrection({ Gd_gdbh:row['工单编号']});//接口调用函数
+    const DataCorrection_list = await DataCorrection({ Gd_gdbh:row['工单编号']});
+    console.log(DataCorrection_list)
     scgdformData.value = DataCorrection_list.data;
     dialogFormVisible.value = true
   // }
@@ -3078,21 +3080,6 @@ const _capacityList = async () => {
   }
 
 };
-//=========BOM列表修改========
-// const bomdialogFormVisible = ref(false)
-// //双击修改
-// const gdbomdialogFormVisible = async(row) => {
-//   Object.assign(scgdformData,row);
-//   bomdialogFormVisible.value = true
-// }
-// // BOM列表修改【确定】
-// const bomenterDialog = () => {
-//   bomdialogFormVisible.value = false
-// }
-// // BOM列表修改【关闭弹窗】
-// const bomcloseDialog = () => {
-//   bomdialogFormVisible.value = false
-// }
 
 //截取印件前两位
 const clickybupdate2 = (row,column,event) => {