产品资料新增纸张

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -579,13 +579,8 @@
         <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
           <div class="JKWTree-tree" style="height: 200px">
             <h3> 产品管理</h3>
-<!--            <el-tree :data="treeData" @node-click="handleNodeClick" @node-expand="handleNodeExpand">-->
-<!--              <template #default="{node,data}">{{data['客户编号']}}【{{data['客户名称']}}】</template>-->
-<!--            </el-tree>-->
-            <el-tree :data="treeData" node-key="label" @node-click="handleNodeClick" @node-expand="handleNodeExpand">
-              <template #default="{ node, data }">
-                {{ node.label }}
-              </template>
+            <el-tree :data="treeData" @node-click="handleNodeClick" @node-expand="handleNodeExpand">
+              <template #default="{node,data}">{{data['客户编号']}}【{{data['客户名称']}}】</template>
             </el-tree>
           </div>
         </layout-sider>
@@ -625,14 +620,22 @@
               <el-table-column   sortable align="left" label="更新日期" prop="Mod_rq" width="160" />
             </el-table>
             <div class="gva-pagination">
-<!--              // 组件中使用 pagination 对象-->
+<!--              <el-pagination-->
+<!--                  @size-change="handleSizeChange"-->
+<!--                  @current-change="handleCurrentChange"-->
+<!--                  :current-page="page"-->
+<!--                  :page-sizes="[10, 30, 50, 100]"-->
+<!--                  :page-size="pageSize"-->
+<!--                  layout="total, sizes, prev, pager, next, jumper"-->
+<!--                  :total="total">-->
+<!--              </el-pagination>-->
               <el-pagination
                   @size-change="handleSizeChange"
                   @current-change="handleCurrentChange"
-                  :current-page="pagination.page"
+                  :current-page="page"
                   :page-sizes="[10, 30, 50, 100]"
                   layout="total, sizes, prev, pager, next, jumper"
-                  :total="pagination.total">
+                  :total="total">
               </el-pagination>
             </div>
           </div>
@@ -965,40 +968,40 @@
                               <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="add_gdzlyjent($event, '印件代号', 'yj_zzdh', 'yj_zzmc')"   />
-                                    <el-input v-model="add_yjzlformdata.zzmc" placeholder=""  style="width: 460px;" id="yj_zzmc"   @keydown="add_gdzlyjent($event, 'yj_zzdh', 'yj_zzmc', 'yj_zzdh1')"  />
+                                   <el-input v-model="add_yjzlformdata.zzdh"  class="zhi" id="zzdh" @keydown="add_gdzlyjent($event, '印件名称', 'zzdh', 'zzmc',0)"  placeholder="" style="width: 140px;"/>
+                                   <el-input v-model="add_yjzlformdata.zzmc"  id="zzmc" @keydown="add_gdzlyjent($event, 'zzdh', 'zzmc', 'zzdh1')" style="width: 460px;"/>
                                   </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="add_gdzlyjent($event, 'yj_zzmc', 'yj_zzdh1', 'yj_zzmc1')"  />
-                                    <el-input v-model="add_yjzlformdata.zzmc1" placeholder=""  style="width: 460px;" id="yj_zzmc1"  @keydown="add_gdzlyjent($event, 'yj_zzdh1', 'yj_zzmc1', 'yj_zzdh2')" />
+                                    <el-input v-model="add_yjzlformdata.zzdh1"  placeholder="" style="width: 140px;"  id="zzdh1" @keydown="add_gdzlyjent($event, 'zzmc', 'zzdh1', 'zzmc1',1)"  />
+                                    <el-input v-model="add_yjzlformdata.zzmc1" placeholder=""  style="width: 460px;" id="zzmc1"  @keydown="add_gdzlyjent($event, 'zzdh1', 'zzmc1', '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="add_gdzlyjent($event, 'yj_zzmc1', 'yj_zzdh2', 'yj_zzmc2')" />
-                                    <el-input v-model="add_yjzlformdata.zzmc2" placeholder=""  style="width: 460px;" id="yj_zzmc2"  @keydown="ent($event, 'yj_zzdh2', 'yj_zzmc2', 'yj_zzdh3')"  />
+                                    <el-input v-model="add_yjzlformdata.zzdh2" placeholder="" style="width: 140px;"  id="zzdh2"  @keydown="add_gdzlyjent($event, 'zzmc1', 'zzdh2', 'zzmc2',2)" />
+                                    <el-input v-model="add_yjzlformdata.zzmc2" placeholder=""  style="width: 460px;" id="zzmc2"  @keydown="add_gdzlyjent($event, 'zzdh2', 'zzmc2', '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="add_gdzlyjent($event, 'yj_zzmc2', 'yj_zzdh3', 'yj_zzmc3')"  />
-                                    <el-input v-model="add_yjzlformdata.zzmc3" placeholder=""  style="width: 460px;" id="yj_zzmc3"  @keydown="ent($event, 'yj_zzdh3', 'yj_zzmc3', 'yj_zzdh4')"  />
+                                    <el-input  v-model="add_yjzlformdata.zzdh3" placeholder="" style="width: 140px;"  id="zzdh3"  @keydown="add_gdzlyjent($event, 'zzmc2', 'zzdh3', 'zzmc3',3)"  />
+                                    <el-input v-model="add_yjzlformdata.zzmc3" placeholder=""  style="width: 460px;" id="zzmc3"  @keydown="add_gdzlyjent($event, 'zzdh3', 'zzmc3', '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="add_gdzlyjent($event, 'yj_zzmc3', 'yj_zzdh4', 'yj_zzmc4')" />
-                                    <el-input v-model="add_yjzlformdata.zzmc4" placeholder=""  style="width: 460px;" id="yj_zzmc4"  @keydown="ent($event, 'yj_zzdh4', 'yj_zzmc4', 'yj_tlgg')"  />
+                                    <el-input v-model="add_yjzlformdata.zzdh4"  placeholder="" style="width: 140px;"  id="zzdh4" @keydown="add_gdzlyjent($event, 'zzmc3', 'zzdh4', 'zzmc4',4)" />
+                                    <el-input v-model="add_yjzlformdata.zzmc4" placeholder=""  style="width: 460px;" id="zzmc4"  @keydown="add_gdzlyjent($event, 'zzdh4', 'zzmc4', 'yj_tlgg')"  />
                                   </el-row>
                                 </el-form-item>
                               </el-col>
@@ -1079,7 +1082,7 @@
                   </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" />
+                  <el-tree :data="getProductZhiListdata" :props="{children: 'children',label: 'label', value: '物料代码'}" @node-click="selectZhiNode" />
                 </div>
               </div>
             </el-form>
@@ -1195,7 +1198,7 @@
                         <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_yjno"   placeholder="" style="width: 90px;" id="Gy0_yjno"/>
+                        <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" />
@@ -1216,7 +1219,7 @@
                     </el-col>
                     <el-col :span="6">
                       <el-form-item label="工艺名称:" prop="address" class="mab"  label-width="100">
-                        <el-input v-model="add_gyformData.gy0_gxmc"  placeholder="" style="width: 140px;" id="gy0_gxmc"  @keydown="ent($event, 'gy0_site', 'gy0_gxmc', 'add_gxmc')"/>
+                        <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>
@@ -1224,7 +1227,7 @@
                   <el-row>
                     <el-col :span="24">
                       <el-form-item label="工序名称:" prop="address" class="mab">
-                        <el-input v-model="add_gyformData.Add_gxmc"  placeholder="" style="width: 100%;" id="add_gxmc"  @keydown="ent($event, 'gy0_gxmc', 'add_gxmc', 'Gy0_sbbh')"/>
+                        <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>
@@ -1328,17 +1331,17 @@
                   <el-row>
                     <el-col :span="8">
                       <el-form-item label="工序方案:" prop="address"  class="mab">
-                        <el-input v-model="ybformDataTest['YB_方案']"  placeholder="" style="width: 100px;" id="YB_方案"  @keydown="ent($event, 'gy0_site', 'YB_方案', 'YB_Yjno')"/>
+                        <el-input v-model="ybformDataTest['YB_方案']" clearable placeholder="" style="width: 100px;" id="YB_方案"  @keydown="ent($event, 'gy0_site', 'YB_方案', 'YB_Yjno')"/>
                       </el-form-item>
                     </el-col>
                     <el-col :span="8">
                       <el-form-item label="印件号:" prop="address"  class="mab">
-                        <el-input v-model="ybformDataTest['YB_Yjno']"  placeholder="" style="width: 100px;"  id="YB_Yjno"  @keydown="ent($event, 'YB_方案', 'YB_Yjno', '工序编号')"/>
+                        <el-input v-model="ybformDataTest['YB_Yjno']" clearable placeholder="" style="width: 100px;"  id="YB_Yjno"  @keydown="ent($event, 'YB_方案', 'YB_Yjno', '工序编号')"/>
                       </el-form-item>
                     </el-col>
                     <el-col :span="8">
                       <el-form-item label="工序编号:" prop="address"  class="mab">
-                        <el-input v-model="ybformDataTest['']"  placeholder="" style="width: 100px;"  id="工序编号"  @keydown="ent($event, 'YB_Yjno', '工序编号', '工艺名称')"/>
+                        <el-input v-model="ybformDataTest['']" clearable placeholder="" style="width: 100px;"  id="工序编号"  @keydown="ent($event, 'YB_Yjno', '工序编号', '工艺名称')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -1346,35 +1349,35 @@
                   <el-row>
                     <el-col :span="24">
                       <el-form-item label="工艺名称:" prop="address"  class="mab">
-                        <el-input v-model="ybformDataTest['gy0_site']"  placeholder="" style="width: 100%;"  id="工艺名称"  @keydown="ent($event, '工序编号', '工艺名称', '工序名称')"/>
+                        <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;"  id="工艺名称"  @keydown="ent($event, '工序编号', '工艺名称', '工序名称')"/>
                       </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="ybformDataTest['gy0_site']"  placeholder="" style="width: 100%;"  id="工序名称"  @keydown="ent($event, '工艺名称', '工序名称', '存货编码')"/>
+                        <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;"  id="工序名称"  @keydown="ent($event, '工艺名称', '工序名称', '存货编码')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row>
                     <el-col :span="10 ">
                       <el-form-item label="存货编码:" prop="address"  class="mab">
-                        <el-input v-model="ybformDataTest['存货编码']"  placeholder="" style="width: 140px;"  id="存货编码"  @keydown="ent($event, '工序名称', '存货编码', '印版名称')"/>
+                        <el-input v-model="ybformDataTest['存货编码']" clearable placeholder="" style="width: 140px;"  id="存货编码"  @keydown="ent($event, '工序名称', '存货编码', '印版名称')"/>
                       </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="ybformDataTest['印版名称']"  placeholder="" style="width: 100%;"  id="印版名称"  @keydown="ent($event, '存货编码', '印版名称', 'gy0_site')"/>
+                        <el-input v-model="ybformDataTest['印版名称']" clearable placeholder="" style="width: 100%;"  id="印版名称"  @keydown="ent($event, '存货编码', '印版名称', 'gy0_site')"/>
                       </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="ybformDataTest['gy0_site']"  placeholder="" style="width: 100%;"  id="gy0_site"  @keydown="ent($event, '印版名称', 'gy0_site', 'YB_方案')"/>
+                        <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;"  id="gy0_site"  @keydown="ent($event, '印版名称', 'gy0_site', 'YB_方案')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -1384,7 +1387,7 @@
             <template #footer>
               <div class="dialog-footer">
                 <el-button @click="ybcloseDialog">取 消</el-button>
-                <el-button type="primary" disabled  @click="ybenterDialog">确 定</el-button>
+                <el-button type="primary" disabled @click="ybenterDialog">确 定</el-button>
               </div>
             </template>
           </el-dialog>
@@ -1463,7 +1466,7 @@
             </el-form>
           </el-dialog>
 
-		      <!-- 技术附件 -->
+		<!-- 技术附件 -->
           <el-dialog v-model="jsfjdialogFormVisible" :before-close="jsfjcloseDialog" :title="产品技术附件资料" style="margin-top: 40px" height="500px" width="800px" destroy-on-close>
 			  <el-form :model="jsfjformdata" label-position="right" ref="elFormRef" :rules="rule" label-width="75px">
 				<el-row :gutter="24">
@@ -1510,9 +1513,9 @@
 			  </template>
 			</el-dialog>
 
-          <el-dialog v-model="luckyexcelVisible" :before-close="luckyexcelCloseDialog" width="100%" top="0vh">
-            <div id="luckyexcel" style="width: 100%;height: 90vh;"></div>
-          </el-dialog>
+<el-dialog v-model="luckyexcelVisible" :before-close="luckyexcelCloseDialog" width="100%" top="0vh">
+  <div id="luckyexcel" style="width: 100%;height: 90vh;"></div>
+</el-dialog>
 
         </layout-content>
 
@@ -1935,11 +1938,11 @@ const cpgyfzclick = async () => {
     await _getGyTotal();
   }
 };
-//产品工艺复制取消
+//取消
 const cpgyfzhandleCancel = async () => {
     cpgyfzlist.value = false;
 };
-//产品工艺复制确定
+//确定
 const is_copy_gy = ref(0);
 const is_copy_yb = ref(0);
 const toProUpperCase = ref('');
@@ -2435,25 +2438,8 @@ const hscstzCancel = () => {hscstzlist.value = false;};
 const treeData = ref({})
 const getCustomdata = async () => {
   try {
-    // const data  = await getCustom()
-    // console.log("左侧菜单列表↓")
-    // console.log(data)
-    // treeData.value = data.data;
-    const response = await getCustom();
-    console.log("左侧菜单列表↓");
-    console.log(response);
-    const formattedData = [];
-    for (const category in response.data) {
-      const categoryNode = {
-        label: category, // 使用分类名称作为节点标签
-        children: response.data[category].map(item => ({
-          label: `${item['客户编号']}【${item['客户名称']}】`, // 将客户信息格式化为节点标签
-          ...item // 保留原始数据，可能在后面需要使用
-        }))
-      };
-      formattedData.push(categoryNode);
-    }
-    treeData.value = formattedData;
+    const data  = await getCustom()
+    treeData.value = data.data;
   } catch (error) {
     console.error('Error fetching custom data:', error);
   }
@@ -2464,11 +2450,6 @@ getCustomdata()
 const tableData = reactive([])
 const _custom_code = ref(null)
 const handleNodeClick = async (node) => {
-  if(node.label === '印刷产品' || node.label === '糊盒产品'){
-    tableData.splice(0);
-    return false;
-  }
-  console.log(node.客户编号)
   _custom_code.value = node.客户编号;
   //清空搜索框
   searchInfo.value = '';
@@ -2494,8 +2475,6 @@ const tableRowClick = async (row) => {
   _product_code.value = row.产品编号;
   _kehu_code.value = row.产品名称;
   const res = await getProductData({product_code:_product_code.value});
-  console.log(row.产品编号 + "--->下方表格获取数据")
-  console.log(res)
   yjtableData.splice(0, yjtableData.length, ...res.data.yjData);
   gytableData.splice(0, gytableData.length, ...res.data.gyData);
   ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
@@ -2507,6 +2486,8 @@ const tableRowClick = async (row) => {
 	  tmp = tmp.sort((a,b)=>b-a)
 	  yjzuidahaoma.value = Number(tmp[0]) + 1
   }
+  // console.log(yjzuidahaoma.value)
+  // yjzuidahaoma.value = yjtableData.length+1
 };
 
 //搜索查询
@@ -2517,52 +2498,42 @@ const onSubmit = () => {
   _getProduct();
 };
 
-// 分页参数和表格数据作为响应式对象
-const pagination = reactive({
-  page: 1,
-  total: 0,
-  pageSize: 10,
-  isLoading: false, // 加载状态
-});
-// 封装获取单个产品基础数据方法
-const _getProduct = async () => {
-  let params = {
-    search: searchInfo.value,
-    custom_code: _custom_code.value,
-    limit: pagination.pageSize,
-    page: pagination.page,
-  };
-  console.log(params);
-  pagination.isLoading = true; // 开始加载
+//封装获取单个产品基础数据方法
+const _getProduct = async ()=>{
+  let params = {}
+  params.search = searchInfo.value;
+  params.custom_code = _custom_code.value;
+  params.limit = pageSize.value;
+  params.page = page.value;
+  console.log(params)
   try {
     const WorkListdata = await getProduct(params);
-    console.log("通过左侧菜单列表获取数据↓");
-    console.log(WorkListdata.data.data);
-    if (WorkListdata.data.data.length === 0) {
-      ElMessage({ type: 'warning', message: '未查询到搜索条件' });
-      tableData.length = 0; // 清空表格数据
-      pagination.total = 0; // 重置总数
-    } else {
-      tableData.splice(0, tableData.length, ...WorkListdata.data.data); // 更新表格数据
-      pagination.total = 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);
-    ElMessage({ type: 'error', message: '数据加载失败' });
-  } finally {
-    pagination.isLoading = false; // 结束加载
   }
-};
+}
 
-// 分页处理函数
+// 分页
+const page = ref(1)
+const total = ref(0)
+const pageSize = ref(30)
 const handleCurrentChange = (val) => {
-  pagination.page = val;
+  page.value = val;
   _getProduct();
 };
 
+// 修改页面容量 点击多少条/页
 const handleSizeChange = (val) => {
-  pagination.pageSize = val;
-  pagination.page = 1; // 修改每页数量时重置到第一页
+
+  pageSize.value = val;
   _getProduct();
 };
 
@@ -2706,6 +2677,7 @@ const addcpyj_onclick = () => {
 	  gdyj_clearFormData();
 	  add_gdyjdialogFormVisible.value = true
 	}
+	
 }
 //印件代号Tab或回车
 // const openSearchModal = (code) => {
@@ -2737,14 +2709,39 @@ const openSearchZhiModal = (code, idx) => {
     zzdhIndex.value = idx
   }
 }
+//3.5获取纸张代号及名称
+const searchZhiHandle = async(v) => {
+  const response = await getProductZzList({search:v});
+  getProductZhiListdata.value = handleTreeDatas(response.data)
+}
+//3.5获取纸张代号及名称
 const _getProductZzList = async ()=>{
   try {
     const response = await getProductZzList({search:''});
-    getProductZhiListdata.value = handleTreeData(response.data)
+    getProductZhiListdata.value = handleTreeDatas(response.data)
   } catch (error) {
     console.error(error);
   }
 }
+//印件新增【纸张】树状图
+const handleTreeDatas = (treeData) => {
+  const data = Object.keys(treeData).map((key)=>({
+    label:key,
+    children: Object.keys(treeData[key]).map((keys)=>({
+      label:keys,
+      children:Object.keys(treeData[key][keys]).map((keyss)=>({
+        label:keyss,
+        children:treeData[key][keys][keyss].map(item=>({
+          label:`${item.物料代码} ${item.物料名称}`,
+          规格:item.规格,
+          物料代码:item.物料代码,
+          物料名称:item.物料名称
+        }))
+      }))
+    }))
+  }))
+  return data
+}
 const _getProductYjList = async ()=>{
   try {
     const response = await getProductYjList({search:''});
@@ -2753,9 +2750,10 @@ const _getProductYjList = async ()=>{
     console.error(error);
   }
 }
+//印件新增【印件代码】树状图
 const handleTreeData = (treeData) => {
-  const data = Object.keys(treeData).map((key)=>({
-    label:key,
+ const data = Object.keys(treeData).map((key)=>({
+   label:key,
     children: Object.keys(treeData[key]).map((keys)=>({
       label:keys,
       children:treeData[key][keys].map(item=>({
@@ -2767,38 +2765,17 @@ const handleTreeData = (treeData) => {
   }))
   return data
 }
-
-//印件新增【纸张】树状图
-const handleTreeDatas = (treeData) => {
-  const data = Object.keys(treeData).map((key)=>({
-    label:key,
-    children: Object.keys(treeData[key]).map((keys)=>({
-      label:keys,
-      children:Object.keys(treeData[key][keys]).map((keyss)=>({
-        label:keyss,
-        children:treeData[key][keys][keyss].map(item=>({
-          label:`${item.物料代码} ${item.物料名称}`,
-          规格:item.规格,
-          物料代码:item.物料代码,
-          物料名称:item.物料名称
-        }))
-      }))
-    }))
-  }))
-  return data
-}
-
+//纸张tab 点击事件
 const selectZhiNode = (v) => {
-  if (v.children.length === 0) {
+  if(v.物料名称){
     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.物料名称
-    }
+          add_yjzlformdata['zzdh'] = v.物料代码
+          add_yjzlformdata['zzmc'] = v.物料名称
+          add_yjzlformdata['tlgg'] = v.规格
+        } else {
+          add_yjzlformdata['zzdh' + zzdhIndex.value] = v.物料代码
+          add_yjzlformdata['zzmc' + zzdhIndex.value] = v.物料名称
+        }
     searchZhiModel.value = false
   }
 }
@@ -2845,7 +2822,20 @@ const add_gdyjenterDialog = () => {
   };
   console.log(formattedData)
   const res=addProductYjInfo(formattedData)
-  console.log(res)
+  res.then(result => {
+    if(result.code===0){
+		ElMessage({
+		  type: 'success',
+		  message: '成功'
+		})
+	 add_gdyjdialogFormVisible.value = false
+	}else{
+		ElMessage({
+		  type: 'error',
+		  message: '失败'
+		})
+	}	
+  });
 
 }
 //印件新增取消
@@ -2881,7 +2871,6 @@ const add_yinjian_ent = (event,id1,id2,id3) => {
     }
   }
 }
-//新增印件表格input
 const add_gdzlyjent = async (event,id1,id2,id3,idx) => {
   if (id2 === 'yjdh' && event.key==='Tab' || id2 === 'yjdh' && event.key=== 'Enter') {
     _getProductYjList();
@@ -2938,10 +2927,22 @@ const add_gdzlyjent = async (event,id1,id2,id3,idx) => {
     }
   }
 }
+
+
+
+
+
+
 //===============新增工艺资料=======================
 const addgydialogFormVisible = ref(false)
 const searchCJModel = ref(false)
-const searchSHModel = 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: '',
@@ -2956,31 +2957,20 @@ const add_gyformData = reactive({
   Gy0_sbbh: '',
   Gy0_shdh: '',
   工价系数: '',
-  难度系数:'',
-  损耗率:'',
-  损耗系数: '',
+  难度系数:'1.000',
+  损耗率:'0.00140',
+  损耗系数: '1.000',
   工序备注: '',
   质量要求: '',
   质量隐患: '',
   Sys_id: _username.value,
   标准损耗2:'',
 });
-//新增工艺资料按钮
-const addcpgy_onclick = () => {
-  //打开弹窗
-  addgydialogFormVisible.value=true
-  //清空input数据
-  Object.keys(add_gyformData).forEach(key => {
-    add_gyformData[key] = '';
-  });
-  add_gyformData['难度系数'] = '1.000';
-  add_gyformData['损耗率'] = '0.00140';
-  add_gyformData['损耗系数'] = '1.000';
-}
 const getcjmc = (code) => {
   // if (code.key==='Tab') {
   //   setTimeout(() =>document.querySelector('#yjdhId').focus(), 50)
   //   _getCJList();
+
   // }
   _getCJList()
 }
@@ -3014,6 +3004,7 @@ const _getCJList = async () => {
 };
 const selectCJNode = (nodeData) => {
   console.log(nodeData.level)
+
   if(nodeData.level==2){
 	console.log(nodeData.label)
 	add_gyformData.Gy0_site=nodeData.label
@@ -3036,7 +3027,35 @@ const _getSH = async () => {
   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 = {
@@ -3058,18 +3077,27 @@ const addgyenterDialog = () => {
     质量要求: add_gyformData['质量要求'],
     质量隐患: add_gyformData['质量隐患'],
     Sys_id  : _username.value,
+    // 万小张: add_yjzlformdata['万小张'],
   };
   console.log(formattedData)
   const res=addProductGyInfo(formattedData)
-  console.log(res)
-  // if(res.code === 0){
-  //   ElMessage({type: 'success',message: '更新成功'})
-  //   addgydialogFormVisible.value = false
-  // } else {
-  //   ElMessage({type: 'error',message: '更新失败' })
-  // }
+  res.then(result => {
+    if(result.code===0){
+  		ElMessage({
+  		  type: 'success',
+  		  message: '成功'
+  		})
+		addgydialogFormVisible.value = false
+  	}else{
+  		ElMessage({
+  		  type: 'error',
+  		  message: '失败'
+  		})
+  	}	
+  });
+  
 }
-//新增工艺资料取消
+//工艺新增取消
 const addgycloseDialog = () => {
   addgydialogFormVisible.value = false
 }
@@ -3088,24 +3116,20 @@ const add_ybformDataTest = reactive({
 })
 //点击新增印版资料
 const addyb_onclick = async () => {
-  addybdialogFormVisible.value = true;
-  console.log(_UniqID.value)
+  console.log(_UniqID)
   if(_UniqID.value === '' || _UniqID.value === undefined || _UniqID.value === null){
     ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能'})
     return false;
   }else{
     const getProductYbInfo_list = await getProductYbInfo({UniqID:_UniqID.value});
-    console.log(getProductYbInfo_list)
-    if(getProductYbInfo_list.message === 'Request failed with status code 500'){
-      console.log("新增印版资料-->后台接口错误")
-    }
+    console.log(getProductYbInfo_list.data.gy_data)
     //默认取第一个数据
     // add_ybformDataTest.gongxu = getProductYbInfo_list.data.gy_data[0]['gy'];
     add_ybformDataTest.gxmc1 = getProductYbInfo_list.data['印版名称'];
     addybdisplaydata.gongxuNameOptions = getProductYbInfo_list.data.gy_data.map(item=>{
       return item.gy
     });
-
+    addybdialogFormVisible.value = true;
   }
 
 };
@@ -3143,8 +3167,6 @@ const addtbenterDialog = async () => {
   console.log(formattedData)
   const addProductYbInfo_add = await addProductYbInfo(formattedData);
   if(addProductYbInfo_add.code === 0) {
-    const res = await getProductData({product_code:_product_code.value});
-    ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
     ElMessage({type: 'success',message: '更新成功'})
     addybdialogFormVisible.value = false;
   } else {
@@ -3270,6 +3292,7 @@ const gyenterDialog = () => {
     工序备注: gyformDataTest['工序备注'],
     质量要求: gyformDataTest['质量要求'],
     质量隐患: gyformDataTest['质量隐患'],
+
   };
   console.log(formattedData)
   // const editdata = await 修改工艺接口函数(formattedData);
@@ -3287,61 +3310,34 @@ const gycloseDialog = () => {
 }
 
 //=========印版修改========
-const editybdisplaydata = reactive({
-  chbm:'',
-  chbmNameOptions:[],
-})
-const edit_ybformDataTest = reactive({
-  gongxu:'',
-  gongxuNameOptions:[],
-})
-
 let ybformDataTest = reactive({})
-//双击修改印版资料
+//双击修改
 const ybupdateCompanyFunc = async (row) => {
+  console.log(ybformDataTest)
   console.log(row)
-  //打开弹窗
-  ybdialogFormVisible.value = true;
-  //清空input数据
-  Object.keys(ybformDataTest).forEach(key => {
-    ybformDataTest[key] = '';
-  });
-  // const getProductYbInfo_list = await getProductYbInfo({UniqID:_UniqID.value});
-  // console.log(getProductYbInfo_list)
-  // if(getProductYbInfo_list.message === 'Request failed with status code 500'){
-  //   console.log("新增印版资料-->后台接口错误")
-  // }
-  // //默认取第一个数据
-  // // add_ybformDataTest.gongxu = getProductYbInfo_list.data.gy_data[0]['gy'];
-  // edit_ybformDataTest.gxmc1 = getProductYbInfo_list.data['印版名称'];
-  // editybdisplaydata.gongxuNameOptions = getProductYbInfo_list.data.gy_data.map(item=>{
-  //   return item.gy
-  // });
-
   Object.assign(ybformDataTest,row);
+  // ybformDataTest = row;
+  ybdialogFormVisible.value = true;
 };
 // 弹窗
 const ybdialogFormVisible = ref(false)
-// 印版资料确定
-const ybenterDialog = async () => {
+// 打开修改弹窗
+const ybenterDialog = () => {
+  console.log(ybformDataTest)
   const formattedData = {
-    'UniqId': _UniqID.value,
-    'YB_方案': ybformDataTest['YB_方案'],
-    'YB_Yjno': ybformDataTest['YB_Yjno'],
-    // 'YB_gxh': ybformDataTest['YB_gxh'],
+    '工序方案': ybformDataTest['YB_方案'],
+    '印件号': ybformDataTest['YB_Yjno'],
     '存货编码': ybformDataTest['存货编码'],
     '印版名称': ybformDataTest['印版名称'],
   };
   console.log(formattedData)
-  const editdata = await editProductYbInfo(formattedData);
+  // const editdata = await 修改印版接口函数(formattedData);
   // if (editdata.code === 0) {
-  //   ybdialogFormVisible.value = true
-  //   const res = await getProductData({product_code:_product_code.value});
-  //   ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
   //   ElMessage({type: 'success',message: '更新成功'})
   // } else {
   //   ElMessage({ type: 'error',message: '更新失败'})
   // }
+  // ybdialogFormVisible.value = true
 }
 // 关闭弹窗
 const ybcloseDialog = () => {
@@ -3351,11 +3347,10 @@ const ybcloseDialog = () => {
 //===========改变按钮中表格修改背景颜色=========
 //计损色数修正表格修改颜色  :cell-style="setInputCellStyle"
 const setInputCellStyle = (data) => {
-  console.log(data)
   const jiSun = ['ms_coe', 'Gy0_Ks', 'Gy0_ls', 'Add_gxmc', 'remark']
   let style = { padding: 0 }
   if (data.column?.property && jiSun.includes(data.column?.property)) {
-    Object.assign(style, { backgroundColor: '#80FA80'})
+    Object.assign(style, { backgroundColor: '#42b983'})
   }
   return style
 }
@@ -3426,11 +3421,6 @@ const tableDataCellClass = ({row, column, rowIndex, columnIndex}) =>{
   }
 }
 
-
-
-
-
-
 //点击技术附件按钮
 const jsfjClick = () => {
 	if(_Gd_gdbh.value == null){
@@ -3731,7 +3721,7 @@ const createROLuckyExcel = (files) => {
   display: flex;
 }
 .JKWTree-tree {
-  /*width: 300px;*/
+  width: 300px;
   background-color: #fff;
   /*background-color: rgba(241, 224, 224, 0.99);*/
   padding: 10px;