瀏覽代碼

生产管理

liuhairui 1 年之前
父節點
當前提交
6f6165723a
共有 2 個文件被更改,包括 306 次插入173 次删除
  1. 303 137
      src/view/yunyin/chanpinziliao/chanpinziliao.vue
  2. 3 36
      src/view/yunyin/shengchanguanli/gongdanziliao.vue

+ 303 - 137
src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -18,6 +18,7 @@
               <el-button type="primary" class="bt" icon="edit"  @click="hscstzClick" >核算参数调整</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="edit"  @click="addyb_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>
@@ -64,9 +65,6 @@
             <el-form-item label="" class="mab" >
               <el-checkbox  v-model="cpgyfzformData['fzybzl']"  id="fzybzl" @keydown="add_cpgyfzent($event, 'fzgyzl', 'fzybzl', 'process')" >复制印版资料</el-checkbox>
             </el-form-item>
-
-
-
               <div class="dialog-footer" style="text-align: right ">
                 <el-button @click="cpgyfzhandleCancel">取消</el-button>
                 <el-button type="primary" @click="cpgyfzhandleConfirm">确定</el-button>
@@ -927,7 +925,7 @@
           </el-dialog>
 
           <!-- 新增印件资料 -->
-                    <el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog" :title="'新增印件资料'" height="500px" width="800px" destroy-on-close>
+          <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">
@@ -1038,77 +1036,6 @@
                       </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">
@@ -1145,8 +1072,8 @@
 		    </el-form>
 		  </el-dialog>
 
-          <!-- 修改工艺资料 弹窗 -->
-          <el-dialog v-model="gydialogFormVisible" :before-close="gycloseDialog" :title="'修改工艺资料'" height="300px" width="900px" destroy-on-close>
+      <!-- 修改工艺资料 弹窗 -->
+      <el-dialog v-model="gydialogFormVisible" :before-close="gycloseDialog" :title="'修改工艺资料'" height="300px" width="900px" destroy-on-close>
             <el-row>
               <el-scrollbar>
                 <el-form :model="gyformDataTest" label-position="right" ref="elFormRef" :rules="rule"  >
@@ -1380,74 +1307,150 @@
 		    </el-form>
 		  </el-dialog>
 
-          <!-- 修改印版资料 弹窗 -->
-          <el-dialog v-model="ybdialogFormVisible" :before-close="ybcloseDialog" :title="'修改印版资料'" destroy-on-close>
+      <!-- 修改印版资料 弹窗 -->
+      <el-dialog v-model="ybdialogFormVisible" :before-close="ybcloseDialog" :title="'修改印版资料'" destroy-on-close>
+        <el-row>
+          <el-scrollbar >
+            <el-form :model="ybformDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px" >
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="工序方案:" prop="address"  class="mab">
+                    <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']" 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['']" clearable placeholder="" style="width: 100px;"  id="工序编号"  @keydown="ent($event, 'YB_Yjno', '工序编号', '工艺名称')"/>
+                  </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']" 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']" 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['存货编码']" 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['印版名称']" 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']" clearable placeholder="" style="width: 100%;"  id="gy0_site"  @keydown="ent($event, '印版名称', 'gy0_site', 'YB_方案')"/>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-form>
+          </el-scrollbar>
+        </el-row>
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button @click="ybcloseDialog">取 消</el-button>
+            <el-button type="primary" disabled @click="ybenterDialog">确 定</el-button>
+          </div>
+        </template>
+      </el-dialog>
+
+      <!-- 新增印版资料 弹窗 -->
+      <el-dialog v-model="addybdialogFormVisible" :before-close="addybcloseDialog" :title="'新增印版资料'" height="300px" width="600px" destroy-on-close>
             <el-row>
-              <el-scrollbar >
-                <el-form :model="ybformDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px" >
-                  <el-row>
-                    <el-col :span="8">
-                      <el-form-item label="工序方案:" prop="address"  class="mab">
-                        <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']" clearable placeholder="" style="width: 100px;"  id="YB_Yjno"  @keydown="ent($event, 'YB_方案', 'YB_Yjno', '工序编号')"/>
+              <el-scrollbar>
+                <el-form :model="add_ybformDataTest" label-position="right" ref="elFormRef" :rules="rule"  >
+                  <input type="hidden" v-model="add_ybformDataTest.gxmc1">
+                  <el-form-item label="" prop="gongxu" class="mab" label-width="50">
+                    <el-select v-model="add_ybformDataTest.gongxu" placeholder="请选择"  id="chbm" style="width: 400px;">
+                      <el-option v-for="option in addybdisplaydata.gongxuNameOptions" @click="ongongxufanclick" :key="option" :label="option"  :value="option" />
+                    </el-select>
+                  </el-form-item>
+
+                    <el-form-item label="工序方案:" prop="address" class="mab" >
+                      <el-input disabled v-model="add_ybformDataTest.YB_方案"  placeholder="" style="width: 90px;" id="YB_方案"/>
+                      <el-form-item label="印件编号:" prop="address" class="mab" label-width="100">
+                        <el-input disabled v-model="add_ybformDataTest.YB_Yjno"  placeholder="" style="width: 90px;" id="YB_Yjno"/>
                       </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                      <el-form-item label="工序编号:" prop="address"  class="mab">
-                        <el-input v-model="ybformDataTest['']" clearable placeholder="" style="width: 100px;"  id="工序编号"  @keydown="ent($event, 'YB_Yjno', '工序编号', '工艺名称')"/>
+                      <el-form-item label="工序编号:" prop="address" class="mab" label-width="100">
+                        <el-input disabled v-model="add_ybformDataTest.YB_gxh"  placeholder="" style="width: 90px;" id="YB_gxh"/>
                       </el-form-item>
-                    </el-col>
-                  </el-row>
+                    </el-form-item>
+
+                  <el-form-item label="工艺名称:" prop="address" class="mab" >
+                    <el-input disabled v-model="add_ybformDataTest.YB_gymc"  placeholder="" style="width: 500px;" id="YB_gymc"/>
+                  </el-form-item>
+                  <el-form-item label="工序名称:" prop="address" class="mab" >
+                    <el-input disabled v-model="add_ybformDataTest.YB_gxmc"  placeholder="" style="width: 500px;" id="YB_gxmc"/>
+                  </el-form-item>
+
+                  <br>
+                  <el-form-item label="存货编码:" prop="address" class="mab" >
+                    <el-input  v-model="add_ybformDataTest.物料代码"  placeholder="" style="width: 200px;" id="YB_gxmc"  @keydown="add_ybzlent($event, '', 'YB_gxmc', '')"/>
+                  </el-form-item>
+                  <el-form-item label="存货名称:" prop="address" class="mab" >
+                    <el-input disabled  v-model="add_ybformDataTest.物料名称"  placeholder="" style="width: 500px;" id="YB_gxmc"/>
+                  </el-form-item>
+                  <el-form-item label="印版备注:" prop="address" class="mab" >
+                    <el-input  type="textarea" resize="none" v-model="add_ybformDataTest.ybbz" rows="1" clearable   style="flex: 1;resize: none" />
+                  </el-form-item>
 
-                  <el-row>
-                    <el-col :span="24">
-                      <el-form-item label="工艺名称:" prop="address"  class="mab">
-                        <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']" 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['存货编码']" 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['印版名称']" 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']" clearable placeholder="" style="width: 100%;"  id="gy0_site"  @keydown="ent($event, '印版名称', 'gy0_site', 'YB_方案')"/>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
                 </el-form>
               </el-scrollbar>
             </el-row>
             <template #footer>
               <div class="dialog-footer">
-                <el-button @click="ybcloseDialog">取 消</el-button>
-                <el-button type="primary" disabled @click="ybenterDialog">确 定</el-button>
+                <el-button @click="addtbcloseDialog">取 消</el-button>
+                <el-button type="primary"   @click="addtbenterDialog">确 定</el-button>
               </div>
             </template>
           </el-dialog>
+
+          <!-- 新增印版资料查询存货编码 -->
+          <el-dialog v-model="addybdisplay" :before-close="() => addybdisplay = false">
+            <el-form>
+              <div>
+                <el-form-item label="" prop="originalName" class="mab">
+                  <el-select v-model="addybdisplaydata.chbm" placeholder="请选择"  id="chbm" style="width: 200px;">
+                    <el-option v-for="option in addybdisplaydata.chbmNameOptions" @click="onybzlfanclick" :key="option" :label="option"  :value="option" />
+                  </el-select>
+<!--                </el-form-item>-->
+
+<!--                <el-form-item label=""  class="mab" prop="keyOrder">-->
+                  <el-space>
+                    <el-input v-model="addyb_keyword" style="width: 100%;margin-left: 20px"/>
+                    <el-button @click="addyb_searchHandle(addyb_keyword)"  style="width: 10%;">刷新</el-button>
+                  </el-space>
+                </el-form-item>
+                <div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
+                  <el-tree :data="getYBListdata" :props="defaultProps" @node-click="addyb_selectSHNode" />
+                </div>
+              </div>
+            </el-form>
+          </el-dialog>
+
+
         </layout-content>
 
       </layout>
@@ -1503,6 +1506,7 @@ import {
   editGyName,
   editGyNo,
   editProduct,
+  getProductYbMaterialDetail,
   editProductYjInfo,
   getProductGyInfo,
   getCustom,
@@ -1526,6 +1530,9 @@ import {
   getProcessLoss,
   addProductGyInfo,
   copyProductGy,
+  getProductYbMaterialList,
+  getProductYbInfo,
+  addProductYbInfo,
 } from '@/api/yunyin/yunying'
 defineOptions({   name: 'Company'})
 
@@ -2385,25 +2392,25 @@ const jstableData = reactive([])
 const _product_code = ref(null)
 //全局调用产品名称
 const _kehu_code = ref(null)
+const _UniqID = ref(null)
 //点击表格行 下方表格获取数据
 const tableRowClick = async (row) => {
+  _UniqID.value = row.UniqID;
 	_Gd_gdbh.value = row.产品编号;
   _product_code.value = row.产品编号;
   _kehu_code.value = row.产品名称;
   const res = await getProductData({product_code:_product_code.value});
+  console.log(ybtableData.length, ...res.data.ybData)
   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)
-  {
+  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
 };
@@ -2896,6 +2903,163 @@ const addgyenterDialog = () => {
 const addgycloseDialog = () => {
   addgydialogFormVisible.value = false
 }
+//=========新增印版资料========
+const addybdialogFormVisible = ref(false)
+const addybdisplay = ref(false)
+const addyb_keyword = ref('')
+const getYBListdata = ref([])
+const addybdisplaydata = reactive({
+  chbm:'',
+  chbmNameOptions:[],
+})
+const add_ybformDataTest = reactive({
+  gongxu:'',
+  gongxuNameOptions:[],
+})
+//点击新增印版资料
+const addyb_onclick = async () => {
+  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.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;
+  }
+
+};
+//点击下拉框获取数据方案、印件、编号、工艺名称、工序名称
+const ongongxufanclick = async (v) => {
+  add_ybformDataTest.YB_方案 = add_ybformDataTest.gongxu.split('-->')[0];
+  add_ybformDataTest.YB_Yjno = add_ybformDataTest.gongxu.split('-->')[1].split('-')[0];
+  add_ybformDataTest.YB_gxh = add_ybformDataTest.gongxu.split('-->')[1].split('-')[1].split('-')[0].split(' ')[0];
+  add_ybformDataTest.YB_gymc = add_ybformDataTest.gongxu.split('-->')[1].split('-')[1].split('-')[0].split(' ')[1];
+  add_ybformDataTest.YB_gxmc = add_ybformDataTest.gxmc1;
+  // addybdialogFormVisible.value = false;
+};
+
+//新增印版资料确定
+const addtbenterDialog = async () => {
+  // console.log(add_ybformDataTest)
+  if(add_ybformDataTest.YB_方案 === '' || add_ybformDataTest.YB_方案 === undefined){
+    ElMessage({type: 'warning',message: '工艺方案不能为空'})
+    return false;
+  }
+  if(add_ybformDataTest.物料代码 === '' || add_ybformDataTest.物料代码 === undefined){
+    ElMessage({type: 'warning',message: '存货编码不能为空'})
+    return false;
+  }
+  const formattedData = {
+    YB_Cpdh: _Gd_gdbh.value,
+    YB_方案: add_ybformDataTest.YB_方案 ,
+    YB_Yjno: add_ybformDataTest.YB_Yjno,
+    YB_gxh: add_ybformDataTest.YB_gxh,
+    存货编码: add_ybformDataTest.物料代码,
+    印版名称: add_ybformDataTest.物料名称,
+    Sys_id: '[1016/邹训敏]',
+    // 印版备注: add_ybformDataTest.ybbz,
+  };
+  // console.log(formattedData)
+  const addProductYbInfo_add = await addProductYbInfo(formattedData);
+  console.log(addProductYbInfo_add)
+  if(addProductYbInfo_add.code === 0) {
+    ElMessage({type: 'success',message: '更新成功'})
+    addybdialogFormVisible.value = false;
+  } else {
+    ElMessage({type: 'error',message: '更新失败' })
+  }
+};
+//新增印版资料取消
+const addtbcloseDialog = async () => {
+  addybdialogFormVisible.value = false;
+};
+
+//新增印版资料弹窗 键盘 input框跳转
+const add_ybzlent = async (event,id1,id2,id3) => {
+  if (id2==='YB_gxmc' && event.key==='Tab' || id2 === 'YB_gxmc' && event.key=== 'Enter') {
+    addybdisplay.value = true
+    addyb_keyword.value = '';
+    await _getProductYbMaterialList();
+  }
+  if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
+    if(id3!=''){
+      document.getElementById(id3).focus()
+    }
+  } else if (event.keyCode === 38) { // 向上箭头
+    if(id1!=''){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 8) { // 删除箭头
+    if(id1!='' && document.getElementById(id2).value==''){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 37) { // 向左箭头
+    if(id1!='' && document.getElementById(id2).selectionStart==0){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 39) { // 向右箭头
+    if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
+      document.getElementById(id3).focus()
+    }
+  }
+}
+const addyb_searchHandle = async () => {
+  await _getProductYbMaterialDetail();
+};
+//3.11印版资料-获取存货名称列表
+const _getProductYbMaterialList = async () => {
+  const getProductYbMaterialList_list = await getProductYbMaterialList();
+  //默认取第一个数据
+  addybdisplaydata.chbm = getProductYbMaterialList_list.data[0]['编号'] + "【" + getProductYbMaterialList_list.data[0]['名称'] + "】";
+  addybdisplaydata.chbmNameOptions = getProductYbMaterialList_list.data.map(item=>{
+    return `${item.编号}【${item.名称}】`
+  });
+};
+
+//点击下拉框获取输入框的值
+const onybzlfanclick = async () => {
+  await _getProductYbMaterialDetail();
+}
+
+const addyb_selectSHNode = async (v) => {
+  console.log(v.物料代码)
+  if(v.物料名称){
+    add_ybformDataTest.物料代码 = v.物料代码
+    add_ybformDataTest.物料名称 = v.物料名称
+    addybdisplay.value = false
+  }
+}
+
+//点击下拉框获取输入框的值
+const _getProductYbMaterialDetail = async () => {
+  const code = addybdisplaydata.chbm.split('【')[0];
+  console.log(code)
+  console.log(addyb_keyword.value)
+  const getProductYbMaterialDetail_list = await getProductYbMaterialDetail({code:code,search:addyb_keyword.value});
+  getYBListdata.value = Object.keys(getProductYbMaterialDetail_list.data).map((key)=>({
+    label:key,
+    children: Object.keys(getProductYbMaterialDetail_list.data[key]).map((keys)=>({
+      label:keys,
+      children:Object.keys(getProductYbMaterialDetail_list.data[key][keys]).map((keyss)=>({
+        label:keyss,
+        children:getProductYbMaterialDetail_list.data[key][keys][keyss].map(item=>({
+          label:`${item.物料代码}/${item.物料名称}/${item.规格}`,
+          物料代码:item.物料代码,
+          物料名称:item.物料名称,
+        }))
+      }))
+    }))
+  }))
+}
+
+
 //=========修改工艺资料========
 let gyformDataTest = reactive({})
 //双击修改
@@ -2952,6 +3116,8 @@ const gycloseDialog = () => {
 let ybformDataTest = reactive({})
 //双击修改
 const ybupdateCompanyFunc = async (row) => {
+  console.log(ybformDataTest)
+  console.log(row)
   Object.assign(ybformDataTest,row);
   // ybformDataTest = row;
   ybdialogFormVisible.value = true;

+ 3 - 36
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -2037,13 +2037,11 @@ const addgdyj_onclick = () => {
     ElMessage({type: 'warning',message: '请选择具体的工单后,再操作此功能' })
   }else{
     gdyj_clearFormData();
-    // console.log(yjzuidahaoma.value)
     add_gdyjdialogFormVisible.value = true
   }
 }
 //印件新增确定
 const add_gdyjenterDialog =  async  () => {
-  // console.log(add_yjzlformdata)
   if(add_yjzlformdata['yjno'] === ''){
     ElMessage({type: 'warning',message: '印件号不能为空'})
     return false;
@@ -2072,7 +2070,6 @@ const add_gdyjenterDialog =  async  () => {
     yj_zzmc2: add_yjzlformdata['zzmc2'],
     yj_zzmc3: add_yjzlformdata['zzmc3'],
     yj_zzmc4: add_yjzlformdata['zzmc4'],
-
     yj_tlgg: add_yjzlformdata['tlgg'],
     yj_klgg: add_yjzlformdata['klgg'],
     Yj_核算规格: add_yjzlformdata['hsgg'],
@@ -2082,11 +2079,8 @@ const add_gdyjenterDialog =  async  () => {
     yj_ls: add_yjzlformdata['ls'],
     yj_desc: add_yjzlformdata['desc'],
     Sys_id  : "[1031/谭鸿忠]",
-    // 万小张: add_yjzlformdata['万小张'],
   };
-  // console.log(formattedData)
   const PrintDetailAdd_add = await PrintDetailAdd(formattedData);
-  // console.log(PrintDetailAdd_add)
   if(PrintDetailAdd_add.code === 0) {
     ElMessage({type: 'success',message: '添加成功'})
     add_gdyjdialogFormVisible.value = false
@@ -2131,7 +2125,6 @@ const handleTreeDatas = (treeData) => {
           物料名称:item.物料名称
         }))
       }))
-
     }))
   }))
   return data
@@ -2219,23 +2212,6 @@ const addgdgy_onclick = () => {
     addGongYiRef.value.open(_Gd_gdbh.value, gongxu)
   }
 }
-// //新增工艺资料确定
-// const add_gdgyenterDialog = async () => {
-//   console.log(1)
-//   // const formattedData = {
-//   //   Yj_Gdbh: _Gd_gdbh.value,
-//   //   yj_Yjno: add_gdgyformData['yjno'],
-//   //   yj_Yjdh: add_gdgyformData['yjdh'],
-//   // };
-//   // console.log(formattedData)
-//   // const ProcessDetailAdd_add = await ProcessDetailAdd(formattedData);
-//   // console.log(ProcessDetailAdd_add)
-//   // add_gdgydialogFormVisible.value = false
-// }
-//新增工艺资料取消
-// const add_gdgycloseDialog = () => {
-//   add_gdgydialogFormVisible.value = false
-// }
 
 
 // =========== 查改U8工单 ===========
@@ -2318,8 +2294,6 @@ const oncgugdcloneclick = () => {
   cgugdlist.value = false;
 };
 
-
-
 // =========== 工艺流程调整 ===========
 const gylctztableColumns = ref(
     [
@@ -2369,10 +2343,7 @@ const gylctztableData = ref([]);
 const oneditgylctzclick = () => {
   if(_Gd_gdbh.value == null){
     gylctzlist.value = false;
-    ElMessage({
-      type: 'warning',
-      message: '请选择具体的工单后,再操作此功能'
-    })
+    ElMessage({type: 'warning',message: '请选择具体的工单后,再操作此功能'})
   }else{
     gylctzformData['gdbh'] = _Gd_gdbh.value;
     _ProcessFlow();
@@ -2479,7 +2450,6 @@ const _ReferenceWorkOrder = async ()=>{
       const schemes = ReferenceWorkOrder_data.data || [];
       // 直接将数组作为工艺方案数组
       gdzlfjxxformData.cpgyfans = schemes;
-
       if (gdzlfjxxformData.cpgyfans.length > 0) {
         gdzlfjxxformData.cpgyfan = [gdzlfjxxformData.cpgyfans[0]];
       }
@@ -2529,16 +2499,13 @@ const gxclhsformData = reactive({
 const oneditgxclhsclick = () => {
   if(_Gd_gdbh.value == null){
     gxclhslist.value = false;
-    ElMessage({
-      type: 'warning',
-      message: '请选择具体的工单后,再操作此功能'
-    })
+    ElMessage({type: 'warning',message: '请选择具体的工单后,再操作此功能'})
   }else{
     gxclhsformData['gdbh'] = _Gd_gdbh.value;
     gxclhslist.value = true;
   }
 };
-//工序产量核算【确定】
+//工序产量核算【确定】(未完成)
 const gxclhshandleConfirm = async () => {
   console.log(gxclhsformData['gdbh'])
   // const  = await ({:gxclhsformData['gdbh']});