新增 首页 侧边栏

src/api/jixiaoguanli/jitairibaobiao.js

@@ -948,4 +948,12 @@ export const ModelChangeRecord = (params) => {
     method: 'get',
     params
   })
+}
+
+export const index = (params) => {
+  return service({
+    url: '/mes_server/Facility/index',
+    method: 'get',
+    params
+  })
 }

src/api/yunyin/yunying.js

@@ -204,6 +204,22 @@ export const addProductGyInfo = (data) => {
         data
     })
 }
+//3.8获取损耗
+export const getProcess = (params) => {
+    return service({
+        url: '/mes_server/Process/getProcess',
+        method: 'get',
+        params
+    })
+}
+//3.8获取单个损耗
+export const getProcessLoss = (params) => {
+    return service({
+        url: '/mes_server/Process/getProcessLoss',
+        method: 'get',
+        params
+    })
+}
 //3.9印版资料-获取产品印版资料
 export const getProductYbInfo = (params) => {
     return service({

src/view/dashboard/dashboardCharts/echartsLine.vue

@@ -1,7 +1,8 @@
 <template>
+  <!-- <div class="dashboard-line-box"> -->
   <div class="dashboard-line-box">
     <div class="dashboard-line-title">
-      访问趋势
+      近一年工单数
     </div>
     <div
       ref="echart"
@@ -13,24 +14,32 @@
 import * as echarts from 'echarts'
 import { nextTick, onMounted, onUnmounted, ref, shallowRef } from 'vue'
 // import 'echarts/theme/macarons'
-
-var dataAxis = []
-for (var i = 1; i < 13; i++) {
-  dataAxis.push(`${i}月`)
+import {
+ index
+} from '@/api/jixiaoguanli/jitairibaobiao'
+var dataAxis = [
+  
+]
+// for (var i = 1; i < 13; i++) {
+//   dataAxis.push(`${i}月`)
+// }
+const getindex = async () => {
+    //接口调用函数
+    const response  = await index();
+	console.log()
+	response.data.monthData.forEach(item => {
+	dataAxis.push(item.month);
+	data.push(item.count)	
+	});
+	console.log(dataAxis);
+	console.log(data);
+	 // 数据填充后更新图表数据
+	    if (chart.value) {
+	        setOptions();
+	    }
 }
+getindex()
 var data = [
-  220,
-  182,
-  191,
-  234,
-  290,
-  330,
-  310,
-  123,
-  442,
-  321,
-  90,
-  149,
 ]
 var yMax = 500
 var dataShadow = []
@@ -119,7 +128,7 @@ onUnmounted(() => {
   .dashboard-line {
     background-color: #fff;
     height: 360px;
-    width: 100%;
+    width: 90%;
   }
   .dashboard-line-title {
     font-weight: 600;

src/view/dashboard/dashboardTable/dashboardTable.vue

@@ -1,71 +1,71 @@
 <template>
   <div class="commit-table">
     <div class="commit-table-title">
-      更新日志
+      质量投诉
     </div>
     <div class="log">
       <div
-        v-for="(item,key) in dataTimeline"
-        :key="key"
+        v-for="(item, index) in dataTimeline"
+        :key="index"
         class="log-item"
       >
         <div class="flex-1 flex key-box">
           <span
             class="key"
-            :class="key<3&&'top'"
-          >{{ key+1 }}</span>
+            :class="index < 3 && 'top'"
+          >{{ index + 1 }}</span>
         </div>
-        <div class="flex-5 flex message">{{ item.message }}</div>
-        <div class="flex-3 flex form">{{ item.from }}</div>
+        <div class="flex-5 flex message">{{ item.客诉描述 }}</div>
+        <div class="flex-3 flex form">{{ item.日期 }}</div>
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
-import { Commits } from '@/api/github'
-import { formatTimeToStr } from '@/utils/date.js'
 import { ref } from 'vue'
+import {
+ index
+} from '@/api/jixiaoguanli/jitairibaobiao'
 
-defineOptions({
-  name: 'DashboardTable',
-})
-
-const loading = ref(true)
 const dataTimeline = ref([])
 
-const loadCommits = () => {
-  Commits(0).then(({ data }) => {
-    loading.value = false
-    data.forEach((element, index) => {
-      if (element.commit.message && index < 10) {
-        dataTimeline.value.push({
-          from: formatTimeToStr(element.commit.author.date, 'yyyy-MM-dd'),
-          title: element.commit.author.name,
-          showDayAndMonth: true,
-          message: element.commit.message,
-        })
-      }
-    })
-  })
+const getindex = async () => {
+   
+	// 模拟接口返回的数据
+	const responseData = await index();
+	console.log(responseData)
+	
+	// 提取客诉数据
+	const customerData = responseData.data.customer
+	customerData.forEach((item, index) => {
+	  dataTimeline.value.push({
+	    客诉描述: item['客诉描述'],
+	    日期: item['日期']
+	  })
+	})
 }
+getindex()
+
 
-loadCommits()
 </script>
 
+
 <style lang="scss" scoped>
 .commit-table{
     background-color: #fff;
     height: 400px;
+	margin-right: 3000px;
+	width:150%;	
     &-title{
-        font-weight: 600;
-        margin-bottom: 12px;
+        font-weight: 900;
+        margin-bottom: 10px;
     }
     .log{
       &-item{
         display: flex;
         justify-content: space-between;
-        margin-top: 14px;
+        margin-top: 10px;
         .key-box{
           justify-content: center;
         }

src/view/dashboard/index.vue

@@ -3,48 +3,50 @@
     <div class="gva-card-box">
       <div class="gva-card gva-top-card">
         <div class="gva-top-card-left">
-          <div class="gva-top-card-left-title">早安，管理员，请开始一天的工作吧</div>
-          <div class="gva-top-card-left-dot">{{ weatherInfo }}</div>
-          <el-row class="my-8 w-[500px]">
+          <el-row class="my-8 w-[500px] flex">
             <el-col
               :span="8"
               :xs="24"
-              :sm="8"
+              :sm="6"
             >
               <div class="flex items-center">
-                <el-icon class="dashboard-icon">
-                  <sort />
-                </el-icon>
-                今日流量 (1231231)
+				  <el-icon class="dashboard-icon">
+					<comment />
+				  </el-icon>
+                <label :for="id">计划中工单数:{{labelValue1}}</label>
               </div>
             </el-col>
             <el-col
               :span="8"
               :xs="24"
-              :sm="8"
+              :sm="6"
             >
               <div class="flex items-center">
-                <el-icon class="dashboard-icon">
-                  <avatar />
-                </el-icon>
-                总用户数 (24001)
+                <label :for="id">排程中工单数: {{labelValue2 }}</label>
               </div>
             </el-col>
             <el-col
               :span="8"
               :xs="24"
-              :sm="8"
+              :sm="6"
             >
               <div class="flex items-center">
-                <el-icon class="dashboard-icon">
-                  <comment />
-                </el-icon>
-                好评率 (99%)
+                <label :for="id">制程中工单数:{{ labelValue3 }}</label>
+              </div>
+            </el-col>
+            <el-col
+              :span="8"
+              :xs="24"
+              :sm="6"
+            >
+              <div class="flex items-center">
+                <label :for="id">已完工工单数:{{labelValue4 }}</label>
               </div>
             </el-col>
           </el-row>
-
         </div>
+
+		
         <img
           src="@/assets/dashboard.png"
           class="gva-top-card-right"
@@ -112,6 +114,9 @@ import DashboardTable from '@/view/dashboard/dashboardTable/dashboardTable.vue'
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { useWeatherInfo } from '@/view/dashboard/weather.js'
+import {
+ index
+} from '@/api/jixiaoguanli/jitairibaobiao'
 
 defineOptions({
   name: 'Dashboard'
@@ -119,6 +124,21 @@ defineOptions({
 
 const weatherInfo = useWeatherInfo()
 
+const getindex = async () => {
+    //接口调用函数
+    const response  = await index();
+	console.log(response.data.workOrderData["已完工"].toString())
+	labelValue1.value = response.data.workOrderData["已完工"].toString();
+	labelValue2.value = response.data.workOrderData["计划中"].toString();
+	labelValue3.value = response.data.workOrderData["排程中"].toString();
+	labelValue4.value = response.data.workOrderData["制程中"].toString();
+	
+}
+getindex()
+const labelValue1=ref()
+const labelValue2=ref()
+const labelValue3=ref()
+const labelValue4=ref()
 const toolCards = ref([
   {
     label: '用户管理',
@@ -232,8 +252,8 @@ const toTarget = (name) => {
         }
     }
 }
-.dashboard-icon {
-  @apply flex items-center text-xl mr-2 text-blue-400;
-}
+// .dashboard-icon {
+//   @apply flex items-center text-xl mr-2 text-blue-400;
+// }
 
 </style>

src/view/job/related/related.vue

@@ -2,13 +2,31 @@
   <div>
     <!-- 左侧树形结构 -->
     <el-container>
-      <el-aside width="250px">
+      <!-- <el-aside width="250px">
         <div class="JKWTree-tree">
           <h3>关联工资核算</h3>
           <el-tree :data="treeData" :props="defaultProps" highlight-current="true"
             @node-click="handleNodeClick"></el-tree>
         </div>
-      </el-aside>
+      </el-aside> -->
+	  
+	  <layout-sider
+	    :resize-directions="['right']"
+	    :width="220"
+	    style="margin-right: 10px;"
+	  >
+	    <div
+	      class="JKWTree-tree"
+	      style="height: 70vh;"
+	    >
+	      <h3>关联工资核算</h3>
+	      <el-tree
+	        :data="treeData"
+	        highlight-current
+	        @node-click="handleNodeClick"
+	      />
+	    </div>
+	  </layout-sider>
 
       <el-container>
         <el-main>
@@ -455,6 +473,7 @@ import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
 import { Value } from 'sass'
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 
 defineOptions({
   name: '06-packingDocuments'

src/view/job/rewards/rewards.vue

@@ -2,7 +2,7 @@
   <div>
     <el-container>
 
-      <el-scrollbar height="550px">
+      <!-- <el-scrollbar height="550px">
         <el-aside>
           <div class="JKWTree-tree">
             <h3>工序大废品奖惩记录</h3>
@@ -13,7 +13,25 @@
             />
           </div>
         </el-aside>
-      </el-scrollbar>
+      </el-scrollbar> -->
+	  
+	  <layout-sider
+	    :resize-directions="['right']"
+	    :width="220"
+	    style="margin-right: 10px;"
+	  >
+	    <div
+	      class="JKWTree-tree"
+	      style="height: 70vh;"
+	    >
+	      <h3>工序大废品奖惩记录</h3>
+	      <el-tree
+	        :data="treeData"
+	        highlight-current
+	        @node-click="handleNodeClick"
+	      />
+	    </div>
+	  </layout-sider>
 
       <el-container>
         <!--        <el-header>dd</el-header>-->
@@ -882,7 +900,7 @@
 <script setup>
 import { getRewardDetail, getRewardList, getRewardTab, getRewardTabByGd } from '@/api/mes/job'
 import { createCompany, deleteCompany, deleteCompanyByIds, findCompany, updateCompany } from '@/api/company'
-
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 // 全量引入格式化工具 请按需保留
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { reactive, ref } from 'vue'

src/view/job/sampling/sampling.vue

@@ -2,7 +2,7 @@
   <div>
     <el-container>
 
-      <el-scrollbar max-height="75vh">
+      <!-- <el-scrollbar max-height="75vh">
         <el-aside>
           <div class="JKWTree-tree">
             <h3> 工单抽检记录维护</h3>
@@ -13,7 +13,26 @@
             />
           </div>
         </el-aside>
-      </el-scrollbar>
+      </el-scrollbar> -->
+	  
+	  
+	  <layout-sider
+	    :resize-directions="['right']"
+	    :width="220"
+	    style="margin-right: 10px;"
+	  >
+	    <div
+	      class="JKWTree-tree"
+	      style="height: 70vh;"
+	    >
+	      <h3>工单抽检记录维护</h3>
+	      <el-tree
+	        :data="treeData"
+	        highlight-current
+	        @node-click="handleNodeClick"
+	      />
+	    </div>
+	  </layout-sider>
 
       <el-container>
         <!--        <el-header>dd</el-header>-->
@@ -477,6 +496,7 @@
 </template>
 
 <script setup>
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 import { getSpotList, getSpotTab, getSpotLocal, getSpotInfo, updateSpotData,add } from '@/api/mes/job'
 import { createCompany, deleteCompany, deleteCompanyByIds, findCompany, updateCompany } from '@/api/company'
 import{getYg}from '@/api/mes_api_gty/myapi'

src/view/performance/06-packingDocuments/index.vue

@@ -366,6 +366,7 @@
 <script setup>
 import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+
 // import { Download, Search, Delete } from '@element-plus/icons-vue'
 import { reactive, ref } from 'vue'
 import { getGxMc, getInfo, getLocate, getPackingSideTable, getPackingTable, updatePackingTable, getYg, DeletePackingTable, addPackingTable, getDedh } from '@/api/mes_api_gty/myapi'

src/view/performance/14-overTimePayVerification/index.vue

@@ -3,7 +3,7 @@
     <el-container>
 
       <!-- 左侧树形结构 -->
-      <el-scrollbar max-height="80vh">
+      <!-- <el-scrollbar max-height="80vh">
         <el-aside width="280px">
           <div class="JKWTree-tree">
             <h3>计件员工加班费核查</h3>
@@ -15,7 +15,25 @@
             />
           </div>
         </el-aside>
-      </el-scrollbar>
+      </el-scrollbar> -->
+	  
+	  <layout-sider
+	    :resize-directions="['right']"
+	    :width="220"
+	    style="margin-right: 10px;"
+	  >
+	    <div
+	      class="JKWTree-tree"
+	      style="height: 70vh;"
+	    >
+	      <h3>计件员工加班费核查</h3>
+	      <el-tree
+	        :data="treeData"
+	        highlight-current
+	        @node-click="handleNodeClick"
+	      />
+	    </div>
+	  </layout-sider>
 
       <el-container>
         <el-main>
@@ -127,7 +145,7 @@
 import { Download, Refresh, Search } from '@element-plus/icons-vue'
 import { reactive, ref } from 'vue'
 import { getDownData, getSide, getUpData } from '@/api/mes_api_gty/overTimePayVerification'
-
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 defineOptions({
   name: '06PackingDocuments',
 })

src/view/performance/Dayreports.vue

@@ -84,8 +84,8 @@
 			  <el-table-column align="left" sortable label="拆片条小盒系数" prop="拆片条小盒系数" width="147"/>
 			  <el-table-column align="left" sortable label="工价系数" prop="sczl_工价系数" width="105"/>
 			  <el-table-column align="left" sortable label="日定额" prop="日定额" width="91"/>
-			  <el-table-column align="left" sortable label="千件工价" prop="piecesprice " width="105"/>
-			  <el-table-column align="left" sortable label="补产标准" prop="addstandards " width="105"/>
+			  <el-table-column align="left" sortable label="千件工价" prop="千件工价" width="105"/>
+			  <el-table-column align="left" sortable label="补产标准" prop="补产标准" width="105"/>
 			  <el-table-column align="left" sortable label="创建用户" prop="sys_id" width="120"/>
               <el-table-column align="left" sortable label="创建时间" prop="sys_rq" width="160"/>
               <el-table-column align="left" sortable label="修改时间" prop="mod_rq" width="160"/>
@@ -772,7 +772,8 @@ const getTableData = async() => {
  const response = await getproductionList({date: params.date, sys_id: params.sys_id,
 	  page: page.value.toString(), limit: limit.value.toString()});
    if (response.code === 0) {
-     tableData.splice(0, tableData.length, ...response.data.rows);
+     tableData.splice(0, tableData.length, ...response.data.rows);
+	 console.log(tableData)
    }
  }
 
@@ -1199,6 +1200,7 @@ const getDedhsubmit = () => {
 				   
 				   GetDedhtreeData = treeData; // 假设这是外部可访问的变量
 				   GetDedhVisible.value = true; // 假设这是一个响应式引用
+				   console.log(GetDedhtreeData)
 			}else{
 				formData.value.sczl_dedh = response.data['sys_bh']
 			}
@@ -1870,7 +1872,8 @@ const updateDetailData = async() => {
 		   message: '新增成功',
 		 })
 	 }
-  	 dialogFormVisible.value = false
+  	 dialogFormVisible.value = false
+	 getTableData()
   }else{
   	  const response = await productionedit(restoredData);
 	  if(response.code==0){

src/view/performance/Packagingoutput.vue

@@ -104,7 +104,7 @@
                     <template #default="{ row, $index }">
 						<el-input
                                      v-model="row.sczl_gdbh"
-									 id="工单编号"  @keydown="ent($event, '零头', '工单编号', '印件工序')"
+									 id="工单编号"  
                                      @keyup.enter="handleEnter($index, row)"
                                    />
                                  </template>

src/view/performance/chejianbaogong.vue

@@ -2333,6 +2333,7 @@ function onstatus() {
 function onClear() {
 	huanxingVisible.value=true
 	 RemodelGetTab()
+	 console.log(huanxingtreeData)
 }
 const RemodelGetTab = async() => {
   const response = await remodelGetTab()

src/view/performance/yuangongrigongzi.vue

@@ -2,13 +2,31 @@
   <div>
     <!-- 左侧树形结构 -->
     <el-container>
-      <el-aside width="250px">
+      <!-- <el-aside width="250px">
         <div class="JKWTree-tree">
           <h3>包装工序产量维护</h3>
           <el-tree :data="treeData" :props="defaultProps" highlight-current="true"
             @node-click="handleNodeClick"></el-tree>
         </div>
-      </el-aside>
+      </el-aside> -->
+	  
+	  <layout-sider
+	    :resize-directions="['right']"
+	    :width="220"
+	    style="margin-right: 10px;"
+	  >
+	    <div
+	      class="JKWTree-tree"
+	      style="height: 70vh;"
+	    >
+	      <h3>员工日工资查询</h3>
+	      <el-tree
+	        :data="treeData"
+	        highlight-current
+	        @node-click="handleNodeClick"
+	      />
+	    </div>
+	  </layout-sider>
 
       <el-container>
         <el-main>
@@ -328,7 +346,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
-
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 defineOptions({
   name: '06-packingDocuments'
 })

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -16,8 +16,8 @@
               <el-button type="primary" class="bt" icon="edit"     @click="fjfpxsClick" >质检废品系数</el-button>
               <el-button type="primary" class="bt" icon="edit"     @click="pccstzClick" >排产参数调整</el-button>
               <el-button type="primary" class="bt" icon="edit"     @click="hscstzClick" >核算参数调整</el-button>
-              <el-button type="primary" class="bt" icon="edit"     @click="addcpyj_onclick" disabled>新增印件资料</el-button>
-              <el-button type="primary" class="bt" icon="edit"     @click="addcpgy_onclick" disabled>新增工艺资料</el-button>
+              <el-button type="primary" class="bt" icon="edit"     @click="addcpyj_onclick" >新增印件资料</el-button>
+              <el-button type="primary" class="bt" icon="edit"     @click="addcpgy_onclick" >新增工艺资料</el-button>
               <el-button type="primary" class="bt" icon="Download" @click="cpexportToExcel" disabled>导出产品资料</el-button>
               <el-button type="primary" class="bt" icon="Download" @click="gyexportToExcel" disabled>导出工艺流程</el-button>
             </el-form-item>
@@ -876,111 +876,223 @@
           </el-dialog>
 
           <!-- 新增印件资料 -->
-          <el-dialog v-model="add_yjdialogFormVisible" :before-close="add_yjcloseDialog" :title="'新增印件资料'" height="500px" width="800px" destroy-on-close>
-            <el-row>
-              <el-scrollbar >
-                <el-form :model="add_yjformDataTest" label-position="right" ref="elFormRef" :rules="rule">
-                  <el-row>
-                    <el-form-item label="印件号:" prop="address" class="mab" label-width="100px">
-                      <el-input  placeholder="" style="width: 140px;"  id="印件号"  @keydown="ent($event, '', '印件号', '印件代号')" />
-                    </el-form-item>
-                  </el-row>
-                  <el-row>
-                    <el-form-item label="印件代号:" prop="address" class="mab" label-width="100px">
-                      <el-input  placeholder="" style="width: 140px;"  id="印件代号"  @keydown="ent($event, '印件号', '印件代号', '印件名称')" />
-                    </el-form-item>
-                  </el-row>
-                  <el-row>
-                    <el-col :span="18">
-                      <el-form-item label="印件名称:" prop="address" class="mab" label-width="100px">
-                        <el-input  placeholder="" style="width: 100%;" id="印件名称"  @keydown="ent($event, '印件代号', '印件名称', 'yj_zzdh')" />
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                  <el-row>
-                    <el-col :span="24">
-                      <el-form-item label="纸张:" prop="address" class="mab" label-width="100px">
-                        <el-row>
-                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh"  @keydown="ent($event, '印件名称', 'yj_zzdh', 'yj_zzmc')" />
-                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc"  @keydown="ent($event, 'yj_zzdh', 'yj_zzmc', 'yj_zzdh1')"  />
-                        </el-row>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                      <el-form-item label="备用纸张1:" prop="address" class="mab" label-width="100px">
-                        <el-row>
-                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh1"  @keydown="ent($event, 'yj_zzmc', 'yj_zzdh1', 'yj_zzmc1')" />
-                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc1"  @keydown="ent($event, 'yj_zzdh1', 'yj_zzmc', 'yj_zzdh2')"  />
-                        </el-row>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                      <el-form-item label="备用纸张2:" prop="address" class="mab" label-width="100px">
-                        <el-row>
-                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh2"  @keydown="ent($event, 'yj_zzmc1', 'yj_zzdh', 'yj_zzmc2')" />
-                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc2"  @keydown="ent($event, 'yj_zzdh2', 'yj_zzmc', 'yj_zzdh3')"  />
-                        </el-row>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                      <el-form-item label="备用纸张3:" prop="address" class="mab" label-width="100px">
-                        <el-row>
-                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh3"  @keydown="ent($event, 'yj_zzmc2', 'yj_zzdh', 'yj_zzmc3')" />
-                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc3"  @keydown="ent($event, 'yj_zzdh3', 'yj_zzmc', 'yj_zzdh4')"  />
-                        </el-row>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                      <el-form-item label="备用纸张4:" prop="address" class="mab" label-width="100px">
-                        <el-row>
-                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh4"  @keydown="ent($event, 'yj_zzmc3', 'yj_zzdh', 'yj_zzmc4')" />
-                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc4"  @keydown="ent($event, 'yj_zzdh4', 'yj_zzmc', 'yj_tlgg')"  />
-                        </el-row>
-                      </el-form-item>
-                    </el-col>
-
-                  </el-row>
-                  <el-row>
-                    <el-col :span="8">
-                      <el-form-item label="投料(mm*mm):" prop="address" class="mab">
-                        <el-input  placeholder=""  style="width: 140px;"  id="yj_tlgg"  @keydown="ent($event, 'yj_zzmc', 'yj_tlgg', 'yj_klgg')"/>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                      <el-form-item label="开料(mm*mm):" prop="address" class="mab">
-                        <el-input placeholder="" style="width: 140px;"  id="yj_klgg"  @keydown="ent($event, 'yj_tlgg', 'yj_klgg', 'yj_ks')"/>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                  <el-row>
-                    <el-col :span="10">
-                      <el-form-item label="开数:" prop="address" class="mab" label-width="100px">
-                        <el-input  placeholder="" style="width: 140px;" id="yj_ks"  @keydown="ent($event, 'yj_tlgg', 'yj_ks', 'yj_ls')"/>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                      <el-form-item label="联数:" prop="address" class="mab">
-                        <el-input  placeholder=""  style="width: 140px;" id="yj_ls"  @keydown="ent($event, 'yj_ks', 'yj_ls', 'yj_desc')"/>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                  <el-row>
-                    <el-col :span="24">
-                      <el-form-item label="备注说明:" prop="remark" class="mab">
-                        <el-input type="textarea" rows="4" clearable placeholder="请输入备注说明"  id="yj_desc"  @keydown="ent($event, 'yj_ls', 'yj_desc', '印件号')"/>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                </el-form>
-              </el-scrollbar>
-            </el-row>
-            <template #footer>
-              <div class="dialog-footer">
-                <el-button @click="add_yjcloseDialog">取 消</el-button>
-                <el-button type="primary" disabled @click="add_yjenterDialog">确 定</el-button>
-              </div>
-            </template>
-          </el-dialog>
+                    <el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog" :title="'新增印件资料'" height="500px" width="800px" destroy-on-close>
+                      <el-row>
+                        <el-scrollbar >
+                          <el-form :model="add_yjformDataTest" label-position="right" ref="elFormRef" :rules="rule">
+                            <el-row>
+                              <el-form-item label="印件号:" prop="address" class="mab" label-width="100px">
+                                <el-input v-model="add_yjzlformdata.yjno" placeholder="" style="width: 140px;"  id="印件号"  @keydown="ent($event, '', '印件号', '印件代号')" />
+                              </el-form-item>
+                            </el-row>
+                            <el-row>
+                              <el-form-item label="印件代号:" prop="address" class="mab" label-width="100px">
+                                <el-input v-model="add_yjzlformdata.yjdh" placeholder="" style="width: 140px;"  id="印件代号" @keydown="openSearchModal"   />
+                              </el-form-item>
+                            </el-row>
+                            <el-row>
+                              <el-col :span="18">
+                                <el-form-item label="印件名称:" prop="address" class="mab" label-width="100px">
+                                  <el-input v-model="add_yjzlformdata.yjmc" placeholder="" style="width: 100%;" id="印件名称"  @keydown="ent($event, '印件代号', '印件名称', 'yj_zzdh')" />
+                                </el-form-item>
+                              </el-col>
+                            </el-row>
+                            <el-row>
+                              <el-col :span="24">
+                                <el-form-item label="纸张:" prop="address" class="mab" label-width="100px">
+                                  <el-row>
+                                    <el-input v-model="add_yjzlformdata.zzdh"  placeholder="" style="width: 140px;"  id="yj_zzdh" @keydown="openSearchZhiModal($event, 0)"   />
+                                    <el-input v-model="add_yjzlformdata.zzmc" placeholder=""  style="width: 460px;" id="yj_zzmc"    />
+                                  </el-row>
+                                </el-form-item>
+                              </el-col>
+                              <el-col :span="24">
+                                <el-form-item label="备用纸张1:" prop="address" class="mab" label-width="100px">
+                                  <el-row>
+                                    <el-input v-model="add_yjzlformdata.zzdh1"  placeholder="" style="width: 140px;"  id="yj_zzdh1"  @keydown="openSearchZhiModal($event, 1)"  />
+                                    <el-input v-model="add_yjzlformdata.zzmc1" placeholder=""  style="width: 460px;" id="yj_zzmc1"  @keydown="ent($event, 'yj_zzdh1', 'yj_zzmc', 'yj_zzdh2')"  />
+                                  </el-row>
+                                </el-form-item>
+                              </el-col>
+                              <el-col :span="24">
+                                <el-form-item label="备用纸张2:" prop="address" class="mab" label-width="100px">
+                                  <el-row>
+                                    <el-input v-model="add_yjzlformdata.zzdh2" placeholder="" style="width: 140px;"  id="yj_zzdh2"  @keydown="openSearchZhiModal($event, 2)"  />
+                                    <el-input v-model="add_yjzlformdata.zzmc2" placeholder=""  style="width: 460px;" id="yj_zzmc2"  @keydown="ent($event, 'yj_zzdh2', 'yj_zzmc', 'yj_zzdh3')"  />
+                                  </el-row>
+                                </el-form-item>
+                              </el-col>
+                              <el-col :span="24">
+                                <el-form-item label="备用纸张3:" prop="address" class="mab" label-width="100px">
+                                  <el-row>
+                                    <el-input  v-model="add_yjzlformdata.zzdh3" placeholder="" style="width: 140px;"  id="yj_zzdh3"  @keydown="openSearchZhiModal($event, 3)"  />
+                                    <el-input v-model="add_yjzlformdata.zzmc3" placeholder=""  style="width: 460px;" id="yj_zzmc3"  @keydown="ent($event, 'yj_zzdh3', 'yj_zzmc', 'yj_zzdh4')"  />
+                                  </el-row>
+                                </el-form-item>
+                              </el-col>
+                              <el-col :span="24">
+                                <el-form-item label="备用纸张4:" prop="address" class="mab" label-width="100px">
+                                  <el-row>
+                                    <el-input v-model="add_yjzlformdata.zzdh4"  placeholder="" style="width: 140px;"  id="yj_zzdh4"  @keydown="openSearchZhiModal($event, 4)"  />
+                                    <el-input v-model="add_yjzlformdata.zzmc4" placeholder=""  style="width: 460px;" id="yj_zzmc4"  @keydown="ent($event, 'yj_zzdh4', 'yj_zzmc', 'yj_tlgg')"  />
+                                  </el-row>
+                                </el-form-item>
+                              </el-col>
+          
+                            </el-row>
+                            <el-row>
+                              <el-col :span="8">
+                                <el-form-item label="投料(mm*mm):" prop="address" class="mab">
+                                  <el-input v-model="add_yjzlformdata.tl" placeholder=""  style="width: 140px;"  id="yj_tlgg"  @keydown="ent($event, 'yj_zzmc', 'yj_tlgg', 'yj_klgg')"/>
+                                </el-form-item>
+                              </el-col>
+                              <el-col :span="8">
+                                <el-form-item label="开料(mm*mm):" prop="address" class="mab">
+                                  <el-input v-model="add_yjzlformdata.kl" placeholder="" style="width: 140px;"  id="yj_klgg"  @keydown="ent($event, 'yj_tlgg', 'yj_klgg', 'yj_ks')"/>
+                                </el-form-item>
+                              </el-col>
+                            </el-row>
+                            <el-row>
+                              <el-col :span="10">
+                                <el-form-item label="开数:" prop="address" class="mab" label-width="100px">
+                                  <el-input v-model="add_yjzlformdata.ks" placeholder="" style="width: 140px;" id="yj_ks"  @keydown="ent($event, 'yj_tlgg', 'yj_ks', 'yj_ls')"/>
+                                </el-form-item>
+                              </el-col>
+                              <el-col :span="10">
+                                <el-form-item label="联数:" prop="address" class="mab">
+                                  <el-input v-model="add_yjzlformdata.ls" placeholder=""  style="width: 140px;" id="yj_ls"  @keydown="ent($event, 'yj_ks', 'yj_ls', 'yj_desc')"/>
+                                </el-form-item>
+                              </el-col>
+							  <el-col :span="10">
+							    <el-form-item label="换算系数(公斤到万张):" prop="address" class="mab">
+							      <el-input v-model="add_yjzlformdata.KgToPages" placeholder=""  style="width: 140px;" id="yj_ls"  @keydown="ent($event, 'yj_ks', 'yj_ls', 'yj_desc')"/>
+							    </el-form-item>
+							  </el-col>
+                            </el-row>
+                            <el-row>
+                              <el-col :span="24">
+                                <el-form-item label="备注说明:" prop="remark" class="mab">
+                                  <el-input v-model="add_yjzlformdata['备注说明']" type="textarea" rows="4" clearable placeholder="请输入备注说明"  id="yj_desc"  @keydown="ent($event, 'yj_ls', 'yj_desc', '印件号')"/>
+                                </el-form-item>
+                              </el-col>
+                            </el-row>
+                          </el-form>
+                        </el-scrollbar>
+                      </el-row>
+                      <template #footer>
+                        <div class="dialog-footer">
+                          <el-button @click="add_dyjcloseDialog">取 消</el-button>
+                          <el-button type="primary"  @click="add_gdyjenterDialog">确 定</el-button>
+                        </div>
+                      </template>
+                    </el-dialog>
+		  
+		  <!-- 新增印件资料弹窗 -->
+		 <!-- <el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog"
+		             style="width: 70%;margin: 8px auto" :title="'新增印件资料'" destroy-on-close>
+		    <el-form label-width="100px" :model="add_yjzlformdata">
+		      <el-form-item label="印件号:" prop="yjno">
+		        <el-input v-model="add_yjzlformdata.yjno" placeholder="" style="width: 140px;"/>
+		      </el-form-item>
+		      <el-form-item label="印件代码:" prop="keyOrder">
+		        <el-input v-model="add_yjzlformdata.yjdh" id="yjdhId" @keydown="openSearchModal" placeholder="" style="width: 140px;"/>
+		        <el-input v-model="add_yjzlformdata.yjmc"  placeholder="" style="width: 80%; margin-left: 10px"/>
+		      </el-form-item>
+		      <el-form-item label="纸张编号:" prop="keyOrder">
+		        <el-input v-model="add_yjzlformdata.zzdh"  class="zhi" @keydown="openSearchZhiModal($event, 0)" placeholder="" style="width: 140px;"/>
+		        <el-input v-model="add_yjzlformdata.zzmc"  placeholder="" style="width: 80%; margin-left: 10px"/>
+		      </el-form-item>
+		      <el-form-item label="备用纸张1:" prop="keyOrder">
+		        <el-input v-model="add_yjzlformdata.zzdh1" class="zhi" @keydown="openSearchZhiModal($event, 1)"  placeholder="" style="width: 140px;"/>
+		        <el-input v-model="add_yjzlformdata.zzmc1"  placeholder="" style="width: 80%; margin-left: 10px"/>
+		      </el-form-item>
+		      <el-form-item label="备用纸张2:" prop="keyOrder">
+		        <el-input v-model="add_yjzlformdata.zzdh2" class="zhi" @keydown="openSearchZhiModal($event, 2)"  placeholder="" style="width: 140px;"/>
+		        <el-input v-model="add_yjzlformdata.zzmc2"  placeholder="" style="width: 80%; margin-left: 10px"/>
+		      </el-form-item>
+		      <el-form-item label="备用纸张3:" prop="keyOrder">
+		        <el-input v-model="add_yjzlformdata.zzdh3" class="zhi" @keydown="openSearchZhiModal($event, 3)"  placeholder="" style="width: 140px;"/>
+		        <el-input v-model="add_yjzlformdata.zzmc3"  placeholder="" style="width: 80%; margin-left: 10px"/>
+		      </el-form-item>
+		      <el-form-item label="备用纸张4:" prop="keyOrder">
+		        <el-input v-model="add_yjzlformdata.zzdh4"  class="zhi" @keydown="openSearchZhiModal($event, 4)" placeholder="" style="width: 140px;"/>
+		        <el-input v-model="add_yjzlformdata.zzmc4" placeholder="" style="width: 80%; margin-left: 10px"/>
+		      </el-form-item>
+		      <div style="display: flex; gap: 0px;">
+		        <el-form-item label="订单数量:" prop="keyOrder">
+		          <el-input v-model="add_yjzlformdata.cpsl" placeholder="" style="width: 100px;"/>
+		        </el-form-item>
+		        <el-form-item label="平张投料:" prop="keyOrder">
+		          <el-input v-model="add_yjzlformdata.pztl"  placeholder="" style="width: 100px;"/>
+		        </el-form-item>
+		        <el-form-item label="万小张:" prop="keyOrder">
+		          <el-input disabled v-model="add_yjzlformdata.万小张"  placeholder="" style="width: 100px;"/>
+		        </el-form-item>
+		        <el-form-item label="纸张规格:" prop="keyOrder">
+		          <el-input disabled v-model="add_yjzlformdata.tlgg"  placeholder="" style="width: 240px;"/>
+		        </el-form-item>
+		      </div>
+		      <div style="display: flex; gap: 0px;">
+		        <el-form-item label="投料规格:" prop="keyOrder">
+		          <el-input v-model="add_yjzlformdata.klgg"  placeholder="" style="width: 100px;"/>
+		        </el-form-item>
+		        <el-form-item label="开料开数:" prop="keyOrder">
+		          <el-input v-model="add_yjzlformdata.ks"  placeholder="" style="width: 100px;"/>
+		        </el-form-item>
+		        <el-form-item label="开料联数:" prop="keyOrder">
+		          <el-input v-model="add_yjzlformdata.ls"  placeholder="" style="width: 100px;"/>
+		        </el-form-item>
+		        <el-form-item label="核算规格:" prop="keyOrder">
+		          <el-input v-model="add_yjzlformdata.hsgg"  placeholder="" style="width: 240px;"/>
+		        </el-form-item>
+		      </div>
+		      <el-form-item label="备注说明:" prop="remark">
+		        <el-input v-model="add_yjzlformdata.desc" type="textarea" resize="none" rows="3" clearable placeholder=""  />
+		      </el-form-item>
+		    </el-form>
+		  
+		    <template #footer>
+		      <div class="dialog-footer" style="text-align: right;">
+		        <el-button @click="add_dyjcloseDialog">取消</el-button>
+		        <el-button type="primary"  @click="add_gdyjenterDialog">确定</el-button>
+		      </div>
+		    </template>
+		  </el-dialog> -->
+		  
+		  <!-- 新增查询印件代码 -->
+		  <el-dialog v-model="searchModel" :before-close="() => searchModel = false">
+		    <el-form>
+		      <div>
+		        <el-form-item label="关键字:"  class="mab" prop="keyOrder">
+		          <el-space>
+		            <el-input v-model="yjdh_keyword" style="width: 100%;"/>
+		            <el-button @click="searchHandle(yjdh_keyword)">刷新</el-button>
+		          </el-space>
+		        </el-form-item>
+		        <div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
+		          <el-tree :data="getProductYjListdata" :props="{children: 'children',label: '物料名称', value: '物料代码'}" @node-click="selectNode" />
+		        </div>
+		      </div>
+		    </el-form>
+		  </el-dialog>
+		  
+		  
+		  <!-- 新增查询印件纸张 -->
+		  <el-dialog v-model="searchZhiModel" :before-close="() => searchZhiModel = false">
+		    <el-form>
+		      <div>
+		        <el-form-item label="关键字:"  class="mab" prop="keyOrder">
+		          <el-space>
+		            <el-input v-model="zhi_keyword" style="width: 100%;"/>
+		            <el-button @click="searchZhiHandle(zhi_keyword)">刷新</el-button>
+		          </el-space>
+		        </el-form-item>
+		        <div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
+		          <el-tree :data="getProductZhiListdata" :props="{children: 'children',label: '物料名称', value: '物料代码'}" @node-click="selectZhiNode" />
+		        </div>
+		      </div>
+		    </el-form>
+		  </el-dialog>
 
           <!-- 修改工艺资料 弹窗 -->
           <el-dialog v-model="gydialogFormVisible" :before-close="gycloseDialog" :title="'修改工艺资料'" height="300px" width="900px" destroy-on-close>
@@ -1081,6 +1193,141 @@
               </div>
             </template>
           </el-dialog>
+		  
+		  <!-- 新增工艺资料 弹窗 -->
+		  <el-dialog v-model="addgydialogFormVisible" :before-close="addgycloseDialog" :title="'新增工艺资料'" height="300px" width="900px" destroy-on-close>
+		    <el-row>
+		      <el-scrollbar>
+		        <el-form :model="gyformDataTest" label-position="right" ref="elFormRef" :rules="rule"  >
+		          <el-row>
+		              <el-form-item label="工序方案:" prop="address" class="mab" >
+		                <el-input v-model="add_gyformData.Gy0_方案"  placeholder="" style="width: 90px;" id="方案"  @keydown="ent($event, '备注', '方案', '加工开数')"/>
+		              </el-form-item>
+		              <el-form-item label="印件编号:" prop="address" class="mab"  label-width="90">
+		                <el-input v-model="add_gyformData.Gy0_cpdh"   placeholder="" style="width: 90px;" id="Gy0_yjno"/>
+		              </el-form-item>
+		              <el-form-item label="工序编号:" prop="address" class="mab" >
+		                <el-input v-model="add_gyformData.Gy0_gxh"   placeholder="" style="width: 90px;" id="Gy0_gxh" />
+		              </el-form-item>
+		              <el-form-item label="加工开数" prop="address" class="mab">
+		                <el-input v-model="add_gyformData.Gy0_Ks"  placeholder="" style="width: 90px;" id="加工开数"  @keydown="ent($event, 'Gy0_gxh', '加工开数', 'Gy0_ls')"/>
+		              </el-form-item>
+		              <el-form-item label="加工联数:" prop="address" class="mab" >
+		                <el-input v-model="add_gyformData.Gy0_ls"  placeholder="" style="width: 90px;" id="Gy0_ls"  @keydown="ent($event, '加工开数', 'Gy0_ls', 'gy0_site')"/>
+		              </el-form-item>
+		          </el-row>
+		  
+		          <el-row>
+		            <el-col :span="6">
+		              <el-form-item label="车间名称:" prop="address" class="mab">
+		                <el-input v-model="add_gyformData.Gy0_site" @keyup.enter="getcjmc()" placeholder="" style="width: 140px;" id="gy0_site"  />
+		              </el-form-item>
+		            </el-col>
+		            <el-col :span="6">
+		              <el-form-item label="工艺名称:" prop="address" class="mab"  label-width="100">
+		                <el-input v-model="add_gyformData.Add_gxmc"  placeholder="" style="width: 140px;" id="gy0_gxmc"  @keydown="ent($event, 'gy0_site', 'gy0_gxmc', 'add_gxmc')"/>
+		              </el-form-item>
+		            </el-col>
+		          </el-row>
+		  
+		          <el-row>
+		            <el-col :span="24">
+		              <el-form-item label="工序名称:" prop="address" class="mab">
+		                <el-input v-model="add_gyformData.gy0_gxmc"  placeholder="" style="width: 100%;" id="add_gxmc"  @keydown="ent($event, 'gy0_gxmc', 'add_gxmc', 'Gy0_sbbh')"/>
+		              </el-form-item>
+		            </el-col>
+		          </el-row>
+		  
+		          <el-row>
+		              <el-form-item label="计损色数:" prop="address" class="mab">
+		                <el-input v-model="add_gyformData.Gy0_Ms"  placeholder="" style="width: 140px;" id="Gy0_sbbh"  @keydown="ent($event, 'add_gxmc', 'Gy0_sbbh', 'sys_mc')"/>
+		              </el-form-item>
+		            <el-form-item label="可用设备:" prop="address" class="mab"  label-width="100">
+		                <el-input v-model="add_gyformData.Gy0_sbbh"   placeholder="" style="" id="可用设备" />
+		              </el-form-item>
+		            <el-form-item label="难度系数:" prop="address" class="mab" label-width="237">
+		                <el-input v-model="add_gyformData.难度系数"   placeholder="" style="width: 90px;" id="工价系数" />
+		              </el-form-item>
+		          </el-row>
+		  
+		          <el-row>
+		              <el-form-item label="标准损耗:" prop="address" class="mab">
+		                <el-input v-model="add_gyformData.标准损耗"  @keyup.enter="getSH()"  placeholder="" style="width: 150px;" id="Gy0_shdh" />
+		                <el-input v-model="add_gyformData.标准损耗2"  placeholder="" style="width: 160px;" id="sys_mc"  @keydown="ent($event, 'Gy0_sbbh', 'sys_mc', '基础损耗')"/>
+		              </el-form-item>
+		              <el-form-item label="基础损耗:" prop="address" class="mab">
+		                <el-input v-model="add_gyformData.Gy0_shdh"  placeholder="" style="width: 70px;" id="基础损耗"  @keydown="ent($event, 'sys_mc', '基础损耗', '损耗率')"/>
+		              </el-form-item>
+		              <el-form-item label="损耗率" prop="address" class="mab" >
+		                <el-input v-model="add_gyformData.损耗率"  placeholder="" style="width: 90px;" id="损耗率"  @keydown="ent($event, '基础损耗', '损耗率', '工序备注')"/>
+		              </el-form-item>
+		              <el-form-item label="损耗系数:" prop="address" class="mab" >
+		                <el-input v-model="add_gyformData.损耗系数"   placeholder="" style="width: 90px;" id="损耗系数"/>
+		              </el-form-item>
+		          </el-row>
+		  
+		          <el-row>
+		            <el-col :span="24">
+		              <el-form-item label="工序备注:" prop="remark" class="mab">
+		                <el-input type="textarea" v-model="add_gyformData.工序备注" rows="2" resize="none" placeholder=""  id="工序备注"  @keydown="ent($event, '损耗率', '工序备注', '质量要求')" />
+		              </el-form-item>
+		            </el-col>
+		            <el-col :span="24">
+		              <el-form-item label="质量要求:" prop="remark" class="mab">
+		                <el-input type="textarea" v-model="add_gyformData.质量要求" rows="2" resize="none" placeholder=""  id="质量要求"  @keydown="ent($event, '工序备注', '质量要求', '质量隐患')" />
+		              </el-form-item>
+		            </el-col>
+		            <el-col :span="24">
+		              <el-form-item label="质量隐患:" prop="remark" class="mab">
+		                <el-input type="textarea" v-model="add_gyformData.质量隐患" rows="2" resize="none" placeholder=""  id="质量隐患"  @keydown="ent($event, '质量要求', '质量隐患', '方案')" />
+		              </el-form-item>
+		            </el-col>
+		          </el-row>
+		        </el-form>
+		      </el-scrollbar>
+		    </el-row>
+		    <template #footer>
+		      <div class="dialog-footer">
+		        <el-button @click="addgycloseDialog">取 消</el-button>
+		        <el-button type="primary"   @click="addgyenterDialog">确 定</el-button>
+		      </div>
+		    </template>
+		  </el-dialog>
+		  
+		  <!-- 新增查询车间名称 -->
+		  <el-dialog v-model="searchCJModel" :before-close="() => searchCJModel = false">
+		    <el-form>
+		      <div>
+		        <!-- <el-form-item label="关键字:"  class="mab" prop="keyOrder">
+		          <el-space>
+		            <el-input v-model="gymc_keyword" style="width: 100%;"/>
+		            <el-button @click="searchHandle(gymc_keyword)">刷新</el-button>
+		          </el-space>
+		        </el-form-item> -->
+		        <div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
+		          <el-tree :data="getCJListdata" :props="defaultProps" @node-click="selectCJNode" />
+		        </div>
+				
+		      </div>
+		    </el-form>
+		  </el-dialog>
+		  
+		  <!-- 新增查询标准损耗 -->
+		  <el-dialog v-model="searchSHModel" :before-close="() => searchSHModel = false">
+		    <el-form>
+		      <div>
+		        <!-- <el-form-item label="关键字:"  class="mab" prop="keyOrder">
+		          <el-space>
+		            <el-input v-model="gymc_keyword" style="width: 100%;"/>
+		            <el-button @click="searchHandle(gymc_keyword)">刷新</el-button>
+		          </el-space>
+		        </el-form-item> -->
+		        <div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
+		          <el-tree :data="getSHListdata" :props="defaultProps" @node-click="selectSHNode" />
+		        </div>		  				
+		      </div>
+		    </el-form>
+		  </el-dialog>
 
           <!-- 修改印版资料 弹窗 -->
           <el-dialog v-model="ybdialogFormVisible" :before-close="ybcloseDialog" :title="'修改印版资料'" destroy-on-close>
@@ -1203,7 +1450,7 @@ import { ref, reactive } from 'vue'
 import {
   DataList,editGyName, editGyNo, editProduct,editProductYjInfo,getProductGyInfo,
   getCustom,getDepartment,getProduct,editGy,getProductData,getProductYjInfo,
-  getProductGy,editGyWaste,editGyMs,getStaffList,setProductStatus} from "@/api/yunyin/yunying";
+  getProductGy,editGyWaste,editGyMs,getStaffList,setProductStatus,getProductYjList,getProductZzList,addProductYjInfo,getDepartName,getProcess,getProcessLoss,addProductGyInfo} from "@/api/yunyin/yunying";
 defineOptions({   name: 'Company'})
 
 // =========== 导出Excel表格 ===========
@@ -1865,12 +2112,25 @@ const _product_code = ref(null)
 const _kehu_code = ref(null)
 //点击表格行 下方表格获取数据
 const tableRowClick = async (row) => {
+	_Gd_gdbh.value = row.产品编号;
   _product_code.value = row.产品编号;
   _kehu_code.value = row.产品名称;
   const res = await getProductData({product_code:_product_code.value});
   yjtableData.splice(0, yjtableData.length, ...res.data.yjData);
   gytableData.splice(0, gytableData.length, ...res.data.gyData);
   ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
+  if(yjtableData.length==0)
+  {
+	   yjzuidahaoma.value = 1
+  }else{
+	  let tmp = yjtableData.map(item => item.yj_yjno)
+	  tmp = tmp.sort((a,b)=>b-a)
+	  yjzuidahaoma.value = Number(tmp[0]) + 1
+  }
+  
+  
+  // console.log(yjzuidahaoma.value)
+  // yjzuidahaoma.value = yjtableData.length+1
 };
 
 //搜索查询
@@ -2012,23 +2272,355 @@ const yjenterDialog = async () => {
 
 //=========新增印件资料========
 //默认弹窗关闭
-const add_yjdialogFormVisible = ref(false)
+const add_gdyjdialogFormVisible = ref(false)
 //新增弹窗
+//全局调用工单编号
+const _Gd_gdbh = ref(null)
+const cgugdlist = ref(false);
 const addcpyj_onclick = () => {
-  add_yjdialogFormVisible.value = true
+	if(_Gd_gdbh.value == null){
+	  cgugdlist.value = false;
+	  ElMessage({
+	    type: 'warning',
+	    message: '请选择具体的工单后，再操作此功能'
+	  })
+	}else{
+	  gdyj_clearFormData();
+	  // console.log(yjzuidahaoma.value)
+	  add_gdyjdialogFormVisible.value = true
+	}
+  // add_yjdialogFormVisible.value = true
+  // console.log(yjtableData.length)
 }
-//印件新增确定
-const add_yjcloseDialog = () => {
-  add_yjdialogFormVisible.value = true
+const searchModel = ref(false)
+const getProductYjListdata = ref()
+const openSearchModal = (code) => {
+  if (code.key==='Tab') {
+    setTimeout(() =>document.querySelector('#yjdhId').focus(), 50)
+    _getProductYjList();
+    searchModel.value = true
+  }
 }
-//印件新增取消
-const add_yjenterDialog = () => {
-  add_yjdialogFormVisible.value = true
+const selectNode = (v) => {
+  if (v.children.length === 0) {
+    add_yjzlformdata['yjdh'] = v.物料代码
+    add_yjzlformdata['yjmc'] = v.物料名称
+    searchModel.value= false
+  }
 }
+const getProductZhiListdata = ref()
+const searchZhiModel = ref(false)
+const zzdhIndex = ref(null)
+const openSearchZhiModal = (code, idx) => {
+  if (code.key==='Tab') {
+    setTimeout(() => document.querySelector('.zhi').focus(), 50)
+    _getProductZzList()
+    searchZhiModel.value = true
+    zzdhIndex.value = idx
 
+  }
+}
+const _getProductZzList = async ()=>{
+  try {
+    const response = await getProductZzList({search:''});
+    getProductZhiListdata.value = handleTreeData(response.data)
+  } catch (error) {
+    console.error(error);
+  }
+}
+const _getProductYjList = async ()=>{
+  try {
+    const response = await getProductYjList({search:''});
+    getProductYjListdata.value = handleTreeData(response.data)
+  } catch (error) {
+    console.error(error);
+  }
+}
+const handleTreeData = (treeData) => {
+  let data = []
+  Object.keys(treeData).map((key, index) => {
+    data.push({
+      物料代码:key.match(/\d+/)[0],
+      物料名称:key,
+      children: []
+    })
+    if (typeof treeData[key] === 'object') {
+      Object.keys(treeData[key]).map((c_key) => {
+        data[index].children.push({
+          物料代码: c_key.match(/\d+/)[0],
+          物料名称: c_key,
+          children: []
+        })
+      })
+    } else if (typeof treeData[key] === 'array') {
+      treeData[key].map(item => data[index].children.push(item))
+    }
+  })
 
+  return data
+}
+const selectZhiNode = (v) => {
+  if (v.children.length === 0) {
+    if (zzdhIndex.value == 0) {
+      add_yjzlformdata['zzdh'] = v.物料代码
+      add_yjzlformdata['zzmc'] = v.物料名称
+	  console.log(v.物料代码)
+	  console.log(v.物料名称)
+	  
+    } else {
+      add_yjzlformdata['zzdh' + zzdhIndex.value] = v.物料代码
+      add_yjzlformdata['zzmc' + zzdhIndex.value] = v.物料名称
+    }
+    searchZhiModel.value = false
+  }
+}
+const yjzuidahaoma = ref(0)
+const add_yjzlformdata = reactive({
+  yjno: '',
+  yjdh: '',
+  yjmc: '',
+  zzdh: '',
+  zzdh1: '',
+  zzdh2: '',
+  zzdh3: '',
+  zzdh4: '',
+  zzmc: '',
+  zzmc1: '',
+  zzmc2: '',
+  zzmc3: '',
+  zzmc4: '',
+  cpsl: '',
+  sjtl: '',
+  pztl: '',
+  tlgg: '',
+  klgg: '',
+  hsgg: '',
+  ks: '',
+  ls: '',
+  desc: '',
+  万小张: '',
+  KgToPages:'',
+});
+//清空对象的属性值
+const gdyj_clearFormData = () => {
+  Object.keys(add_yjzlformdata).forEach(key => {
+    add_yjzlformdata[key] = '';
+  });
+  add_yjzlformdata.yjno = yjzuidahaoma.value;
+  add_yjzlformdata['pztl'] = 0;
+  add_yjzlformdata['ks'] = 0;
+  add_yjzlformdata['ls'] = 0;
+  add_yjzlformdata['万小张'] = 0;
+};
+//印件新增确定
+const add_gdyjenterDialog = () => {
+  console.log(add_yjzlformdata)
+  const formattedData = {
+    yj_cpdh: _Gd_gdbh.value,
+    yj_yjno: add_yjzlformdata['yjno'],
+    yj_yjdh: add_yjzlformdata['yjdh'],
+    yj_yjmc: add_yjzlformdata['yjmc'],
+    yj_zzdh: add_yjzlformdata['zzdh'],
+    yj_zzdh1: add_yjzlformdata['zzdh1'],
+    yj_zzdh2: add_yjzlformdata['zzdh2'],
+    yj_zzdh3: add_yjzlformdata['zzdh3'],
+    yj_zzdh4: add_yjzlformdata['zzdh4'],
+    yj_zzmc: add_yjzlformdata['zzmc'],
+    yj_zzmc1: add_yjzlformdata['zzmc1'],
+    yj_zzmc2: add_yjzlformdata['zzmc2'],
+    yj_zzmc3: add_yjzlformdata['zzmc3'],
+    yj_zzmc4: add_yjzlformdata['zzmc4'],
+    KgToPages:add_yjzlformdata['KgToPages'],
+    yj_tlgg: add_yjzlformdata['tl'],
+    yj_klgg: add_yjzlformdata['kl'],
+    yj_ks: add_yjzlformdata['ks'],
+    yj_ls: add_yjzlformdata['ls'],
+    yj_desc: add_yjzlformdata['desc'],
+    sys_id  : "[1020/邢醉育]",
+    // 万小张: add_yjzlformdata['万小张'],
+  };
+  console.log(formattedData)
+  const res=addProductYjInfo(formattedData)
+  console.log(res)
+  // if(res.code==0){
+	  
+  // }else{
+	  
+  // }
+  // add_gdyjdialogFormVisible.value = false
+}
+//印件新增取消
+const add_dyjcloseDialog = () => {
+  add_gdyjdialogFormVisible.value = false
+}
+// //印件新增确定
+// const add_yjcloseDialog = () => {
+//   add_gdyjdialogFormVisible.value = true
+// }
+// //印件新增取消
+// const add_yjenterDialog = () => {
+//   add_gdyjdialogFormVisible.value = true
+// }
+//新增工艺资料
+const addgydialogFormVisible = ref(false)
+const searchCJModel = ref(false)
+const searchSHModel = ref(false)
+
+const addcpgy_onclick = () => {
+	addgydialogFormVisible.value=true
+  // add_yjdialogFormVisible.value = true
+  // console.log(yjtableData.length)
+}
+const add_gyformData = reactive({
+  Gy0_方案: '',
+  Gy0_cpdh: '',
+  Gy0_yjno: '',
+  Gy0_gxh: '',
+  Gy0_Ks: '',
+  Gy0_ls: '',
+  Gy0_site: '',
+  gy0_gxmc: '',
+  Add_gxmc: '',
+  Gy0_Ms: '',
+  Gy0_sbbh: '',
+  Gy0_shdh: '',
+  工价系数: '',
+  难度系数:'1.000',
+  损耗率:'0.00140',
+  损耗系数: '1.000',
+  工序备注: '',
+  质量要求: '',
+  质量隐患: '',
+  Sys_id: '',
+  标准损耗2:'',
+});
+const getcjmc = (code) => {
+  // if (code.key==='Tab') {
+  //   setTimeout(() =>document.querySelector('#yjdhId').focus(), 50)
+  //   _getCJList();
+      	
+  // }
+  _getCJList()
+}
 
-
+const getCJListdata = ref([]);
+const _getCJList = async () => {
+  try {
+    const response = await getDepartName({ search: '' });
+    getCJListdata.value = Object.keys(response.data).map(process => {
+      return {
+        label: process,
+        level: 1,
+        children: Object.keys(response.data[process]).map(department => {
+          return {
+            label: department,
+            level: 2,
+            children: response.data[process][department].map(subDepartment => {
+              return {
+                label: subDepartment,
+                level: 3
+              };
+            })
+          };
+        })
+      };
+    });
+    searchCJModel.value = true;
+  } catch (error) {
+    console.error(error);
+  }
+};
+const selectCJNode = (nodeData) => {
+  console.log(nodeData.level)
+  
+  if(nodeData.level==2){
+	console.log(nodeData.label)
+	add_gyformData.Gy0_site=nodeData.label 
+  }
+  if(nodeData.level==3){
+	console.log(nodeData.label)
+	add_gyformData.Add_gxmc=nodeData.label
+	searchCJModel.value = false
+  }
+}
+const getSHListdata = ref([]);
+const getSH = (code) => {
+  _getSH()
+}
+const _getSH = async () => {
+  const response = await getProcessLoss({code:add_gyformData.标准损耗});
+  // getSHListdata.value = processData(response.data);
+  // searchSHModel.value = true
+  console.log(response.data[0].sys_mc)
+  add_gyformData.标准损耗2=response.data[0].sys_mc
+  console.log(getSHListdata.value);
+};
+// const processData = (data) => {
+//   const map = {};
+//   const tree = [];
+//   console.log(data)
+//   data.forEach(item => {
+//     map[item.sys_bh] = { label: `${item.sys_bh} ${item.sys_mc}`, level: 1, children: [] };
+	
+//   });
+  
+
+//   data.forEach(item => {
+//     if (item.Parent !== "0_") {
+//       map[item.Parent].children.push(map[item.sys_bh]);	 console.log(item) }
+//    //  } else {
+//    //    tree.push(map[item.sys_bh]);
+// 	  // console.log(item)
+//    //  }
+//   });
+
+//   tree.forEach(item => {
+// 	  // console.log(item)
+//     // if (item.children.length === 0) {
+//       // item.children.push({ label: `${item.sys_bh} ${item.sys_mc}`, level: 2 });
+//     // }
+//   });
+
+//   return tree;
+// };
+//工艺新增确定
+const addgyenterDialog = () => {
+  console.log(add_yjzlformdata)
+  const formattedData = {
+    Gy0_cpdh: _Gd_gdbh.value,
+    Gy0_方案: add_gyformData['Gy0_方案'],
+    Gy0_yjno: add_gyformData['Gy0_yjno'],
+    Gy0_gxh: add_gyformData['Gy0_gxh'],
+    Gy0_Ks: add_gyformData['Gy0_Ks'],
+    Gy0_ls: add_gyformData['Gy0_ls'],
+    Gy0_site: add_gyformData['Gy0_site'],
+    gy0_gxmc: add_gyformData['gy0_gxmc'],
+    Add_gxmc: add_gyformData['Add_gxmc'],
+    Gy0_Ms: add_gyformData['Gy0_Ms'],
+    Gy0_sbbh: add_gyformData['Gy0_sbbh'],
+    Gy0_shdh: add_gyformData['Gy0_shdh'],
+    工价系数: add_gyformData['工价系数'],
+    损耗系数: add_gyformData['损耗系数'],
+    工序备注:add_gyformData['工序备注'],
+    质量要求: add_gyformData['质量要求'],
+    质量隐患: add_gyformData['质量隐患'],
+    Sys_id  : "[1020/邢醉育]",
+    // 万小张: add_yjzlformdata['万小张'],
+  };
+  console.log(formattedData)
+  const res=addProductGyInfo(formattedData)
+  console.log(res)
+  if(res.code==0){
+	  
+  }else{
+	  
+  }
+  addgydialogFormVisible.value = false
+}
+//工艺新增取消
+const addgycloseDialog = () => {
+  addgydialogFormVisible.value = false
+}
 //=========修改工艺资料========
 let gyformDataTest = reactive({})
 //双击修改

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -957,6 +957,114 @@
                 </div>
               </template>
             </el-dialog>
+			
+			
+			<!-- 新增印件资料 -->
+			          <el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog" :title="'新增印件资料'" height="500px" width="800px" destroy-on-close>
+			            <el-row>
+			              <el-scrollbar >
+			                <el-form :model="add_yjformDataTest" label-position="right" ref="elFormRef" :rules="rule">
+			                  <el-row>
+			                    <el-form-item label="印件号:" prop="address" class="mab" label-width="100px">
+			                      <el-input v-model="add_yjzlformdata.yjno" placeholder="" style="width: 140px;"  id="印件号"  @keydown="ent($event, '', '印件号', '印件代号')" />
+			                    </el-form-item>
+			                  </el-row>
+			                  <el-row>
+			                    <el-form-item label="印件代号:" prop="address" class="mab" label-width="100px">
+			                      <el-input  placeholder="" style="width: 140px;"  id="印件代号" @keydown="openSearchModal"   />
+			                    </el-form-item>
+			                  </el-row>
+			                  <el-row>
+			                    <el-col :span="18">
+			                      <el-form-item label="印件名称:" prop="address" class="mab" label-width="100px">
+			                        <el-input  placeholder="" style="width: 100%;" id="印件名称"  @keydown="ent($event, '印件代号', '印件名称', 'yj_zzdh')" />
+			                      </el-form-item>
+			                    </el-col>
+			                  </el-row>
+			                  <el-row>
+			                    <el-col :span="24">
+			                      <el-form-item label="纸张:" prop="address" class="mab" label-width="100px">
+			                        <el-row>
+			                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh"  @keydown="ent($event, '印件名称', 'yj_zzdh', 'yj_zzmc')" />
+			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc"  @keydown="ent($event, 'yj_zzdh', 'yj_zzmc', 'yj_zzdh1')"  />
+			                        </el-row>
+			                      </el-form-item>
+			                    </el-col>
+			                    <el-col :span="24">
+			                      <el-form-item label="备用纸张1:" prop="address" class="mab" label-width="100px">
+			                        <el-row>
+			                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh1"  @keydown="ent($event, 'yj_zzmc', 'yj_zzdh1', 'yj_zzmc1')" />
+			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc1"  @keydown="ent($event, 'yj_zzdh1', 'yj_zzmc', 'yj_zzdh2')"  />
+			                        </el-row>
+			                      </el-form-item>
+			                    </el-col>
+			                    <el-col :span="24">
+			                      <el-form-item label="备用纸张2:" prop="address" class="mab" label-width="100px">
+			                        <el-row>
+			                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh2"  @keydown="ent($event, 'yj_zzmc1', 'yj_zzdh', 'yj_zzmc2')" />
+			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc2"  @keydown="ent($event, 'yj_zzdh2', 'yj_zzmc', 'yj_zzdh3')"  />
+			                        </el-row>
+			                      </el-form-item>
+			                    </el-col>
+			                    <el-col :span="24">
+			                      <el-form-item label="备用纸张3:" prop="address" class="mab" label-width="100px">
+			                        <el-row>
+			                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh3"  @keydown="ent($event, 'yj_zzmc2', 'yj_zzdh', 'yj_zzmc3')" />
+			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc3"  @keydown="ent($event, 'yj_zzdh3', 'yj_zzmc', 'yj_zzdh4')"  />
+			                        </el-row>
+			                      </el-form-item>
+			                    </el-col>
+			                    <el-col :span="24">
+			                      <el-form-item label="备用纸张4:" prop="address" class="mab" label-width="100px">
+			                        <el-row>
+			                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh4"  @keydown="ent($event, 'yj_zzmc3', 'yj_zzdh', 'yj_zzmc4')" />
+			                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc4"  @keydown="ent($event, 'yj_zzdh4', 'yj_zzmc', 'yj_tlgg')"  />
+			                        </el-row>
+			                      </el-form-item>
+			                    </el-col>
+			
+			                  </el-row>
+			                  <el-row>
+			                    <el-col :span="8">
+			                      <el-form-item label="投料(mm*mm):" prop="address" class="mab">
+			                        <el-input  placeholder=""  style="width: 140px;"  id="yj_tlgg"  @keydown="ent($event, 'yj_zzmc', 'yj_tlgg', 'yj_klgg')"/>
+			                      </el-form-item>
+			                    </el-col>
+			                    <el-col :span="8">
+			                      <el-form-item label="开料(mm*mm):" prop="address" class="mab">
+			                        <el-input placeholder="" style="width: 140px;"  id="yj_klgg"  @keydown="ent($event, 'yj_tlgg', 'yj_klgg', 'yj_ks')"/>
+			                      </el-form-item>
+			                    </el-col>
+			                  </el-row>
+			                  <el-row>
+			                    <el-col :span="10">
+			                      <el-form-item label="开数:" prop="address" class="mab" label-width="100px">
+			                        <el-input  placeholder="" style="width: 140px;" id="yj_ks"  @keydown="ent($event, 'yj_tlgg', 'yj_ks', 'yj_ls')"/>
+			                      </el-form-item>
+			                    </el-col>
+			                    <el-col :span="10">
+			                      <el-form-item label="联数:" prop="address" class="mab">
+			                        <el-input  placeholder=""  style="width: 140px;" id="yj_ls"  @keydown="ent($event, 'yj_ks', 'yj_ls', 'yj_desc')"/>
+			                      </el-form-item>
+			                    </el-col>
+			                  </el-row>
+			                  <el-row>
+			                    <el-col :span="24">
+			                      <el-form-item label="备注说明:" prop="remark" class="mab">
+			                        <el-input type="textarea" rows="4" clearable placeholder="请输入备注说明"  id="yj_desc"  @keydown="ent($event, 'yj_ls', 'yj_desc', '印件号')"/>
+			                      </el-form-item>
+			                    </el-col>
+			                  </el-row>
+			                </el-form>
+			              </el-scrollbar>
+			            </el-row>
+			            <template #footer>
+			              <div class="dialog-footer">
+			                <el-button @click="add_yjcloseDialog">取 消</el-button>
+			                <el-button type="primary" disabled @click="add_yjenterDialog">确 定</el-button>
+			              </div>
+			            </template>
+			          </el-dialog>
 
             <!-- 新增印件资料弹窗 -->
             <el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog"

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -1755,18 +1755,18 @@ function onstatus() {
 
 //设置机台状态
 const SetMachineStatus = async () => {
-  // const response = await setMachineStatus({
-	 //  machine:'JY03',
-	 //  gy_name:'02-胶印〖白、黑、哑油【预干】、NT光油',
-	 //  order:'2311114',
-	 //  yjno:'1',
-	 //  class:'ZM00545,ZM01351,ZM01170',
-	 //  status:'维修',
-	 //  production_now:'',
-	 //  production_all:'',
-  // });
-  // if (response.code === 0) {
-  // }
+  const response = await setMachineStatus({
+	  machine:'JY03',
+	  gy_name:'02-胶印〖白、黑、哑油【预干】、NT光油',
+	  order:'2311114',
+	  yjno:'1',
+	  class:'ZM00545,ZM01351,ZM01170',
+	  status:'维修',
+	  production_now:'',
+	  production_all:'',
+  });
+  if (response.code === 0) {
+  }
 }
 
 //客诉记录