生产管理

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

@@ -105,7 +105,7 @@
       </el-tree>
     </el-dialog>
 
-    <el-dialog v-model="cjdisplay" :before-close="()=> cjdisplay = false" style="width: 800px;margin: 8px auto" :title="'车间选择'" destroy-on-close>
+    <el-dialog v-model="cjdisplay" :before-close="()=> cjdisplay = false" style="width: 800px;" :title="'车间选择'" destroy-on-close>
       <el-tree
           :data="cjList"
           :render-after-expand="false"
@@ -306,10 +306,10 @@ const _capacityList = async () => {
 //   // console.log(ProcessDetailAdd_add)
 //   // add_gdgydialogFormVisible.value = false
 // }
-// //新增工艺资料取消
-// const add_gdgycloseDialog = () => {
-//   add_gdgydialogFormVisible.value = false
-// }
+// 新增工艺资料取消
+const add_gdgycloseDialog = () => {
+  visible.value = false
+}
 
 defineExpose({ open })
 </script>

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

@@ -1,14 +1,14 @@
 <template>
   <!--工单打印【弹窗】-->
-  <el-dialog v-model="visibie" title="生产工单打印" >
+  <el-dialog v-model="visibie" title="生产工单打印" style="width: 40%">
     <el-row>
       <el-form-item label="工单编号:" prop="currentProcess" class="mab">
-        <el-input v-model="form['gdbh']"  @keydown="cp_print_ProductValue" placeholder="" />
+        <el-input v-model="form['gdbh']"  @keydown="cp_print_ProductValue" style="width: 200px" />
       </el-form-item>
     </el-row>
     <el-row>
       <el-form-item label="印件号:" prop="yjno" class="mab" label-width="70">
-        <el-select v-model="form['yjno']" placeholder="请选择印件号" style="width: 100px;" @change="getmc">
+        <el-select v-model="form['yjno']" placeholder="请选择印件号" style="width: 120px;" @change="getmc">
           <el-option
               v-for="item in yjlist"
               :label="item.印件号"
@@ -17,7 +17,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="终止工序号:" prop="currentProcess" class="mab" label-width="100">
-        <el-select v-model="form['gxh']" placeholder="请选择工序号" style="width: 100px;">
+        <el-select v-model="form['gxh']" placeholder="请选择工序号" style="width: 120px;">
           <el-option
               v-for="item in gxlist"
               :label="item.工序号"
@@ -27,18 +27,18 @@
       </el-form-item>
     </el-row>
     <el-row>
-      <el-form-item label="印件名称:" prop="currentProcess" class="mab">
-        <el-input v-model="form['yjmc']" placeholder="" style="width: 480px;" />
+      <el-form-item label="印件名称:" prop="currentProcess" class="mab" >
+        <el-input v-model="form['yjmc']" placeholder="" style="width: 500px;" />
       </el-form-item>
     </el-row>
     <el-row>
       <el-form-item label="制单:" prop="currentProcess" class="mab" label-width="70">
-        <el-input v-model="form['zd']" placeholder="" style="width: 480px;" />
+        <el-input v-model="form['zd']" placeholder="" style="width: 500px;" />
       </el-form-item>
     </el-row>
     <el-row>
       <el-form-item label="审核:" prop="currentProcess" class="mab" label-width="70">
-        <el-input v-model="form['sh']" placeholder="" style="width: 480px;"/>
+        <el-input v-model="form['sh']" placeholder="" style="width: 500px;"/>
       </el-form-item>
     </el-row>
     <div class="dialog-footer" style="text-align: right; margin-top: 30px;">
@@ -94,7 +94,7 @@ const _PrintCodeList = async () => {
   const workOrder = form['gdbh'];
   const PrintCodeList_list = await PrintCodeList({workOrder:workOrder});
   if(PrintCodeList_list.data.length === 0){
-    ElMessage({type: 'warning',message: '请输入正确的工单编号'});
+    ElMessage({type: 'warning',message: '工单编号错误 或 印件资料为空'});
   }else{
     yjlist.value = PrintCodeList_list.data
     form['yjno'] = PrintCodeList_list.data[0].印件号;
@@ -2607,6 +2607,7 @@ const hiprintTemplate = new hiprint.PrintTemplate({ template: jsondata })
 const cp_print_handleConfirm = async () => {
   let params = {};
   //2310707
+  //2012127
   params.workOrder = form['gdbh'];
   params.PrepareDocument = form['zd'];
   params.examine = form['sh'];
@@ -2614,6 +2615,10 @@ const cp_print_handleConfirm = async () => {
   params.gxh = form['gxh'];
   //调用打印接口【打印作业通知单】
   const print_PrintJobOrder = await PrintJobOrder(params);
+  console.log(print_PrintJobOrder)
+  if(print_PrintJobOrder.data === null){
+    ElMessage({type: 'error',message: print_PrintJobOrder.msg})
+  }
   // 获取当前日期
   const today = new Date();
   const year = today.getFullYear();
@@ -2684,5 +2689,32 @@ defineExpose({ open })
 </script>
 
 <style scoped>
+:deep(.el-table td .cell) {
+  line-height: 20px !important;
+}
+:deep(.el-tabs__header){
+  margin-bottom: 0;
+}
+.search{
+  margin-left: 0px !important;
+  margin-right: 10px !important;
+}
+.bt{
+  margin-left: 2px !important;
+  padding: 3px !important;
+  font-size: 12px;
+}
+.el-tabs__header{
+  margin: 0px !important;
+}
+.gva-table-box{
+  padding: 0px !important;
+}
+.el-pagination{
+  margin-top: 0px !important;
+}
+.mab{
+  margin-bottom: 5px;
+}
 
 </style>