运营管理

src/api/yunyin/yunying.js

@@ -140,6 +140,88 @@ export const editGyWaste = (data) => {
     })
 }
 
+//3.1获取产品印件资料
+export const getProductYjInfo = (params) => {
+    return service({
+        url: '/mes_server/Product/getProductYjInfo',
+        method: 'get',
+        params
+    })
+}
+//3.2修改产品印件资料
+export const editProductYjInfo = (data) => {
+    return service({
+        url: '/mes_server/Product/editProductYjInfo',
+        method: 'post',
+        data
+    })
+}
+//3.3新增产品印件资料
+export const addProductYjInfo = (data) => {
+    return service({
+        url: '/mes_server/Product/addProductYjInfo',
+        method: 'post',
+        data
+    })
+}
+//3.4获取印件代码及名称
+export const getProductYjList = (params) => {
+    return service({
+        url: '/mes_server/Product/getProductYjList',
+        method: 'get',
+        params
+    })
+}
+//3.5获取纸张代号及名称
+export const getProductZzList = (params) => {
+    return service({
+        url: '/mes_server/Product/getProductZzList',
+        method: 'get',
+        params
+    })
+}
+//3.6工艺资料-获取产品工艺资料
+export const getProductGyInfo = (params) => {
+    return service({
+        url: '/mes_server/Product/getProductGyInfo',
+        method: 'get',
+        params
+    })
+}
+//3.7工艺资料-获取车间及工艺名称
+export const getDepartName = (params) => {
+    return service({
+        url: '/mes_server/Product/getDepartName',
+        method: 'get',
+        params
+    })
+}
+//3.8工艺资料-新增产品工艺
+export const addProductGyInfo = (data) => {
+    return service({
+        url: '/mes_server/Product/addProductGyInfo',
+        method: 'post',
+        data
+    })
+}
+//3.9印版资料-获取产品印版资料
+export const getProductYbInfo = (params) => {
+    return service({
+        url: '/mes_server/Product/getProductYbInfo',
+        method: 'get',
+        params
+    })
+}
+//3.10印版资料-修改产品印版资料
+export const editProductYbInfo = (data) => {
+    return service({
+        url: '/mes_server/Product/editProductYbInfo',
+        method: 'post',
+        data
+    })
+}
+
+
 /** 生产管理 工单资料管理*/
 // 1.工单资料菜单列表
 export const DataList = (params) => {
@@ -330,7 +412,6 @@ export const capacityList = (params) => {
 }
 
 
-
 /**工单生产排单(排产管理)*/
 //计划中工单
 export const Project = (params) => {

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -16,6 +16,8 @@
               <el-button type="primary" icon="edit" @click="fjfpxsClick" class="bt">质检废品系数</el-button>
               <el-button type="primary" icon="edit" @click="pccstzClick" class="bt">排产参数调整</el-button>
               <el-button type="primary" icon="edit" @click="hscstzClick" class="bt">核算参数调整</el-button>
+              <el-button type="primary"  icon="edit"  disabled  @click="addcpyj_onclick"     class="bt">新增印件资料</el-button>
+              <el-button type="primary"  icon="edit"  disabled @click="ddcpgy_onclick"     class="bt">新增工艺资料</el-button>
               <el-button type="primary" disabled icon="Download" @click="cpexportToExcel" style="margin: 5px;display: none">导出产品资料</el-button>
               <el-button type="primary" disabled icon="Download" @click="gyexportToExcel" style="margin: 5px;margin-top: 5px;display: none">导出工艺流程</el-button>
             </el-form-item>
@@ -230,10 +232,10 @@
               </el-form-item>
             </div>
 
+
             <el-table ref="multipleTable"
                       :show-overflow-tooltip="true"
                       :row-style="{ height: '20px' }"
-
                       :header-row-style="{ height: '20px' }"
                       :header-cell-style="{ padding: '0px' }"
                       style="width: 100%;height: 70vh" border tooltip-effect="dark"
@@ -1756,21 +1758,23 @@ const _getProduct = async ()=>{
   let params = {}
   params.search = searchInfo.value;
   params.custom_code = _custom_code.value;
-  // params.limit = 999;
-  // params.page = 1;
   params.limit = pageSize.value;
   params.page = page.value;
   try {
     const WorkListdata = await getProduct(params);
-    tableData.splice(0, tableData.length, ...WorkListdata.data.data);//表格
-    console.log(WorkListdata)
-    total.value = WorkListdata.data.total;//共多少条
+    console.log(WorkListdata.data.data)
+    if(WorkListdata.data.data === []){
+      ElMessage({type: 'warning',message: '未查询到搜索条件'})
+    }else{
+      tableData.splice(0, tableData.length, ...WorkListdata.data.data);//表格
+      console.log(WorkListdata)
+      total.value = WorkListdata.data.total;//共多少条
+    }
   } catch (error) {
     console.error(error);
   }
 }
 
-
 // 分页
 const page = ref(1)
 const total = ref(0)

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -86,7 +86,7 @@
           <!--机组调整【弹窗】-->
           <!--车间设备排程【弹窗】-->
           <el-dialog v-model="cjsbpclist" title="车间设备排程" style="width: 100%;height: 100%;margin: 0px;padding: 0px">
-            <el-button type="" icon="edit" @click="oneditpcClick">更新排程</el-button>
+            <el-button type="" icon="edit" disabled @click="oneditpcClick">更新排程</el-button>
             <el-button type="" @click="cjsbpcCancel">退出</el-button>
 
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; ">
@@ -109,8 +109,8 @@
                 <el-form-item label="" prop="isBanciSelected" style="margin-left: 20px;">
                   <el-checkbox v-model="cjsbpcformData.isBanciSelected">所有班次</el-checkbox>
                 </el-form-item>
-
               </div>
+
               <el-table ref="paichengRef"
                 :show-overflow-tooltip="true"
                 :row-style="{ height: '0px' }"

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -4,7 +4,7 @@
       <layout-header>
       <div class="">
 <!--按钮部分-->
-        <el-form ref="elSearchFormRef" :inline="true"  class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
+        <el-form ref="elSearchFormRef"  class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
           <el-form-item>
             <el-input v-model="searchInfo" clearable placeholder="搜索工单编号" style="width: 180px;"></el-input>
             <el-button type="primary"  icon="search" @click="onSubmit"></el-button>
@@ -14,8 +14,13 @@
             <el-button type="primary"  icon="edit"   @click="oneditgylctzclick" class="bt">工艺流程调整</el-button>
             <el-button type="primary"  icon="edit"   @click="oneditugdclick"    class="bt">查改U8工单</el-button>
             <!--<el-button type="primary" disabled icon="edit" @click="oneditztfwclick" class="bt">状态复位</el-button>-->
-            <el-button type="primary"  icon="edit"   @click="onxzhscsclick"     class="bt">修正核算参数</el-button>
-            <el-button type="primary"  icon="edit"   @click="onzjfpxsclick"     class="bt">质检废品系数</el-button>
+            <el-button type="primary"  icon="edit"   @click="onxzhscsclick"     class="bt" >修正核算参数</el-button>
+            <el-button type="primary"  icon="edit"   @click="onzjfpxsclick"     class="bt" >质检废品系数</el-button>
+            <el-button type="primary"  icon="edit"   @click="gdprintonlick"     class="bt" disabled>工单打印</el-button>
+            <el-button type="primary"  icon="edit"   @click="gdgxclhconlick"    class="bt" disabled>工序产量核查</el-button>
+            <el-button type="primary"  icon="edit"   @click="gdlcdcxconlick"    class="bt" disabled>流程单查询</el-button>
+            <el-button type="primary"  icon="edit"   @click="addgdyj_onclick"   class="bt" disabled>新增印件资料</el-button>
+            <el-button type="primary"  icon="edit"   @click="ddgdgy_onclick"    class="bt" disabled>新增工艺资料</el-button>
           </el-form-item>
         </el-form>
 
@@ -501,34 +506,34 @@
                       :header-cell-style="{ padding: '0px' }"
                       border
                       tooltip-effect="dark"
-                      :data="tableData"
-                      row-key="ID"
+                      :data="tableData" row-key="ID"
                       @row-click="tableRowClick"
                       highlight-current-row="true"
                       :cell-class-name="tableDataCellClass"
                       @row-dblclick="updateCompanyFunc"
                       @selection-change="handleSelectionChange"
                       :show-overflow-tooltip="true">
-<!--              <el-table-column type="selection" width="55"/>-->
-                <el-table-column align="left" label="工单编号" prop="工单编号"  width="90" />
-                <el-table-column align="left" label="生产分类" prop="生产分类" width="90" />
-                <el-table-column align="left" label="销售订单号" prop="销售订单号" width="100" />
-                <el-table-column align="left" label="产品代号" prop="产品代号" width="100" />
-                <el-table-column align="left" label="产品名称" prop="产品名称" width="370" />
-                <el-table-column align="left" label="订单数量" prop="订单数量" width="100" />
-                <el-table-column align="left" label="单位" prop="单位" />
-                <el-table-column align="left" label="折合大箱" prop="折合大箱" width="90" />
-                <el-table-column align="left" label="投料率" prop="投料率"  />
-                <el-table-column align="left" label="平均合格率" prop="平均合格率" width="100" />
-                <el-table-column align="left" label="开单日期" prop="开单日期" width="100" />
-                <el-table-column align="left" label="交货日期" prop="交货日期" width="100" />
-                <el-table-column align="left" label="工单类型" prop="工单类型" width="100" />
-                <el-table-column align="left" label="工单状态" prop="工单状态" width="100" />
+<!--                <el-table-column align="center" type="selection" width="30"/>-->
+                <el-table-column align="left" label="获取状态"    prop="status"  width="81" />
+                <el-table-column align="left" label="工单编号"    prop="工单编号"  width="81" />
+                <el-table-column align="left" label="生产分类"    prop="生产分类" width="81" />
+                <el-table-column align="left" label="销售订单号"  prop="销售订单号" width="100" />
+                <el-table-column align="left" label="产品代号"    prop="产品代号" width="99" />
+                <el-table-column align="left" label="产品名称"    prop="产品名称" width="370" />
+                <el-table-column align="left" label="订单数量"    prop="订单数量" width="100" />
+                <el-table-column align="left" label="单位"       prop="单位" width="54"/>
+                <el-table-column align="left" label="折合大箱"    prop="折合大箱" width="81" />
+                <el-table-column align="left" label="投料率"     prop="投料率" width="80" />
+                <el-table-column align="left" label="平均合格率"  prop="平均合格率" width="95" />
+                <el-table-column align="left" label="开单日期"    prop="开单日期" width="98" />
+                <el-table-column align="left" label="交货日期"    prop="交货日期" width="98" />
+                <el-table-column align="left" label="工单类型"    prop="工单类型" width="98" />
+                <el-table-column align="left" label="工单状态"    prop="工单状态" width="81" />
                 <el-table-column align="left" label="当前生产工序" prop="当前生产工序" width="110" />
                 <el-table-column align="left" label="产量提交时间" prop="产量提交时间" width="110" />
-                <el-table-column align="left" label="建档用户" prop="建档用户" width="110" />
-                <el-table-column align="left" label="建档时间" prop="建档时间" width="160" />
-                <el-table-column align="left" label="更新时间" prop="更新时间" width="160" />
+                <el-table-column align="left" label="建档用户"    prop="建档用户" width="100" />
+                <el-table-column align="left" label="建档时间"    prop="建档时间" width="115" />
+                <el-table-column align="left" label="更新时间"   prop="更新时间" width="160" />
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">
@@ -555,16 +560,16 @@
                         @row-dblclick="gdyjupdateCompanyFunc"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
                 <!--<el-table-column type="selection" width="55" />-->
-                <el-table-column align="left" label="印件号" prop="印件号"  width="80"/>
-                <el-table-column align="left" label="印件代号" prop="印件代号"  width="120"/>
+                <el-table-column align="left" label="印件号" prop="印件号"  width="70"/>
+                <el-table-column align="left" label="印件代号" prop="印件代号"  width="98"/>
                 <el-table-column align="left" label="印件名称" prop="印件名称"  width="340"/>
-                <el-table-column align="left" label="纸张代号" prop="纸张代号"  width="100"/>
+                <el-table-column align="left" label="纸张代号" prop="纸张代号"  width="98"/>
                 <el-table-column align="left" label="纸张名称" prop="纸张名称"  width="340"/>
-                <el-table-column align="left" label="投料规格" prop="投料规格"  width="100"/>
-                <el-table-column align="left" label="平张投料" prop="平张投料"  width="100"/>
-                <el-table-column align="left" label="开料规格" prop="开料规格"  width="100"/>
-                <el-table-column align="left" label="开数*联数" prop="开数*联数"  width="100"/>
-                <el-table-column align="left" label="建档用户" prop="建档用户"  width="120"/>
+                <el-table-column align="left" label="投料规格" prop="投料规格"  width="91"/>
+                <el-table-column align="left" label="平张投料" prop="平张投料"  width="90"/>
+                <el-table-column align="left" label="开料规格" prop="开料规格"  width="90"/>
+                <el-table-column align="left" label="开数*联数" prop="开数*联数"  width="90"/>
+                <el-table-column align="left" label="建档用户" prop="建档用户"  width="115"/>
                 <el-table-column align="left" label="建档时间" prop="建档时间"  width="160"/>
                 <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
               </el-table>
@@ -578,6 +583,7 @@
                         highlight-current-row="true"
                         :show-overflow-tooltip="true"
                         size="small"
+                        :cell-class-name="gysatusCellClass"
                         @row-dblclick="gdgyupdateCompanyFunc"
                         @row-click="clickybupdate2"
                         :row-class-name="rowClassStyle2"
@@ -622,15 +628,15 @@
                         highlight-current-row="true"
                         @row-dblclick="gdbomupdateCompanyFunc"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55" />
+                <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"/>
+                <el-table-column align="left" label="消耗定量" prop="消耗定量"  width="210"/>
                 <el-table-column align="left" label="计划用量" prop="计划用量"  width="100" />
                 <el-table-column align="left" label="建档用户" prop="建档用户"  width="120"/>
                 <el-table-column align="left" label="建档时间" prop="建档时间"  width="160"/>
                 <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
-                <el-table-column align="left" label="消耗定量" prop="消耗定量"  width="210"/>
               </el-table>
             </el-tab-pane>
           </el-tabs>
@@ -811,37 +817,36 @@
 
 		   </el-dialog>
 
-          <!-- 修改印件资料弹窗 -->
+          <!-- 修改印件表格资料弹窗 -->
           <el-dialog v-model="gdyjdialogFormVisible" :before-close="gdyjcloseDialog"
-                     style="width: 1000px; height: 750px; bottom: 7%;"
-                     :title="'修改印件资料'" destroy-on-close>
+                     style="width: 1000px; height: 730px; margin-top: 0;margin-bottom: 0;top: 7%" :title="'修改印件资料'" destroy-on-close>
             <el-form label-width="100px">
               <el-form-item label="印件号:" prop="keyOrder">
                 <el-input v-model="gdyjformData['印件号']" placeholder="" style="width: 140px;"/>
               </el-form-item>
               <el-form-item label="印件代码:" prop="keyOrder">
                 <el-input v-model="gdyjformData['印件代号']" placeholder="" style="width: 140px;"/>
-                <el-input v-model="gdyjformData['印件名称']" placeholder="" style="width: 400px; margin-left: 10px"/>
+                <el-input v-model="gdyjformData['印件名称']" placeholder="" style="width: 80%; margin-left: 10px"/>
               </el-form-item>
               <el-form-item label="纸张编号:" prop="keyOrder">
                 <el-input v-model="gdyjformData['纸张代号']" placeholder="" style="width: 140px;"/>
-                <el-input v-model="gdyjformData['纸张名称']" placeholder="" style="width: 400px; margin-left: 10px"/>
+                <el-input v-model="gdyjformData['纸张名称']" placeholder="" style="width: 80%; margin-left: 10px"/>
               </el-form-item>
               <el-form-item label="备用纸张1:" prop="keyOrder">
                 <el-input v-model="gdyjformData['备用纸张1']" placeholder="" style="width: 140px;"/>
-                <el-input v-model="gdyjformData['纸张名称11']" placeholder="" style="width: 400px; margin-left: 10px"/>
+                <el-input v-model="gdyjformData['纸张名称11']" placeholder="" style="width: 80%; margin-left: 10px"/>
               </el-form-item>
               <el-form-item label="备用纸张2:" prop="keyOrder">
                 <el-input v-model="gdyjformData['备用纸张2']" placeholder="" style="width: 140px;"/>
-                <el-input v-model="gdyjformData['纸张名称22']" placeholder="" style="width: 400px; margin-left: 10px"/>
+                <el-input v-model="gdyjformData['纸张名称22']" placeholder="" style="width: 80%; margin-left: 10px"/>
               </el-form-item>
               <el-form-item label="备用纸张3:" prop="keyOrder">
                 <el-input v-model="gdyjformData['备用纸张3']" placeholder="" style="width: 140px;"/>
-                <el-input v-model="gdyjformData['纸张名称33']" placeholder="" style="width: 400px; margin-left: 10px"/>
+                <el-input v-model="gdyjformData['纸张名称33']" placeholder="" style="width: 80%; margin-left: 10px"/>
               </el-form-item>
               <el-form-item label="备用纸张4:" prop="keyOrder">
                 <el-input v-model="gdyjformData['备用纸张4']" placeholder="" style="width: 140px;"/>
-                <el-input v-model="gdyjformData['纸张名称44']" placeholder="" style="width: 400px; margin-left: 10px"/>
+                <el-input v-model="gdyjformData['纸张名称44']" placeholder="" style="width: 80%; margin-left: 10px"/>
               </el-form-item>
               <div style="display: flex; gap: 0px;">
                 <el-form-item label="订单数量:" prop="keyOrder">
@@ -868,7 +873,7 @@
                   <el-input v-model="gdyjformData['联数']" placeholder="" style="width: 100px;"/>
                 </el-form-item>
                 <el-form-item label="核算规格:" prop="keyOrder">
-                  <el-input v-model="gdyjformData['核算规格']" placeholder="" style="width: 100px;"/>
+                  <el-input v-model="gdyjformData['核算规格']" placeholder="" style="width: 240px;"/>
                 </el-form-item>
               </div>
               <el-form-item label="备注说明:" prop="remark">
@@ -924,10 +929,11 @@
                 </div>
                 <el-form-item label="设备编号:"  class="mab" prop="remark">
                   <el-select v-model="gdgyformData['设备编号']" multiple placeholder="请选择设备编号"
-                             @keydown.tab.prevent="sbbhclick"
-                             @click="sbbhclick" id="设备编号"  @keydown="gyzlent($event, '重点工序', '设备编号', '工序损耗')"
+                             id="设备编号"  @keydown="gyzlent($event, '重点工序', '设备编号', '工序损耗')"
                              style="flex: 1; height: auto;">
                     <el-option
+                        @keydown.tab.prevent="sbbhclick"
+                        @click="sbbhclick"
                         v-for="(item, index) in gdzl_MachineList_address.data"
                         :key="index"
                         :label="item.split('-->')[0].trim()"
@@ -1807,10 +1813,9 @@ const gdyjcloseDialog = () => {
 }
 
 
-//=========工艺列表修改========
+//=========工艺修改========
 const gdgydialogFormVisible = ref(false)
 const gdgyformData = reactive({})
-
 const gdzl_MachineList_address = reactive({
   data: []
 });
@@ -1818,6 +1823,7 @@ const _cjmc = ref(null);
 //双击修改
 const gdgyupdateCompanyFunc = async(row) => {
   console.log(row)
+  gdgyformData['设备编号'] = [];
   if(row['车间名称']){
     _cjmc.value = row['车间名称']
   }else{
@@ -1917,17 +1923,16 @@ const gdgycloseDialog = () => {
 //点击设备编号
 const _capacityListsbbh = ref(null)
 const sbbhclick = () => {
-  console.log(gdgyformData['设备编号'])
-    _capacityListsbbh.value = gdgyformData['设备编号'].join(' ');
-    _capacityList();
+  _capacityList();
 }
 
 
 const _capacityList = async () => {
-  console.log(gdgyformData['设备编号'] )
+  console.log(gdgyformData['设备编号']);
   if(gdgyformData['设备编号'] === ''){
     return false;
   }else{
+    _capacityListsbbh.value = gdgyformData['设备编号'].join(' ');
     console.log(_capacityListsbbh.value);
     const editProductedit_machine = await capacityList({machine:_capacityListsbbh.value});
     console.log(editProductedit_machine)
@@ -1978,7 +1983,15 @@ const tableDataCellClass = ({row, column, rowIndex, columnIndex}) =>{
     return 'plan-usage-low';
   }
 }
-
+//根据工艺状态文字变色
+const gysatusCellClass = ({row, column, rowIndex, columnIndex}) =>{
+  if(row['status'] === '未完工'){
+    return 'status-plan-usage-low';
+  }
+  if(row['status'] === '已完工'){
+    return 'statusy-plan-usage-low';
+  }
+}
 //bom计划用量文字变色
 const planUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
   if (column.property === '计划用量') {
@@ -1986,6 +1999,13 @@ const planUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
   }
 }
 
+//工艺文字变色
+// const planUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
+//   if (column.property === '计划用量') {
+//     return 'plan-usage-low';
+//   }
+// }
+
 //修改工单资料弹窗 键盘 input框跳转
 const gdzlent = (event,id1,id2,id3) => {
   if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
@@ -2039,7 +2059,6 @@ const gyzlent = (event,id1,id2,id3) => {
 
 </script>
 <style scoped>
-
 /* 在样式表中使用媒体查询 */
 @media (max-width: 768px) {
   /* 在小屏幕下的样式设置 */
@@ -2051,6 +2070,13 @@ const gyzlent = (event,id1,id2,id3) => {
 :deep(.plan-usage-low div) {
   color: red !important;
 }
+/*根据工艺状态文字变色*/
+:deep(.status-plan-usage-low div) {
+  color: blue !important;
+}
+:deep(.statusy-plan-usage-low div) {
+  color: #8c939d !important;
+}
 /*印件背景颜色变黄*/
 :deep(.el-table__body .warning-row) {
   background: #FFFF80 !important;
@@ -2062,20 +2088,17 @@ const gyzlent = (event,id1,id2,id3) => {
 .JKWTree-container {
   display: flex;
 }
-
 .JKWTree-tree {
   width: 300px;
   background-color: #fff;
   padding: 10px;
   margin-right: 20px;
 }
-
 .JKWTree-tree h3 {
   font-size: 15px;
   font-weight: 700;
   margin: 10px 0;
 }
-
 .JKWTree-content {
   flex: 1;
 }