Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/view/job/related/related.vue

@@ -269,19 +269,19 @@
 		 </el-dialog>
 		 
 		 
-		 <el-dialog v-model="copyshow" :before-close="closepositioningVisible" :title="复制" destroy-on-close>
+		 <el-dialog v-model="copyshow" :before-close="closepositioningVisible" :title="复制" destroy-on-close  width="700px" >
 		   <el-row :gutter="24">
-		     <el-col :span="7">
+		     <el-col :span="9">
 		       <el-form-item label="日期:" prop="name" class="mab">
 		        <el-input type="date" max="9999-12-31" v-model="formData.old_time" @blur="getcopylist" @keyup.enter.native="getcopylist" :clearable="true" />
 		       </el-form-item>
 		     </el-col>
-		     <el-col :span="7">
+		     <el-col :span="9">
 		       <el-form-item label="复制成:" prop="name" class="mab">
 		   			<el-input type="date" max="9999-12-31" v-model="formData.new_time" :clearable="true" />
 		       </el-form-item>
 		     </el-col>
-			<el-col :span="3">
+			<el-col :span="6">
 				<el-button type="primary" @click="oncopyup">执行</el-button>
 			</el-col>		 
 		   </el-row>
@@ -671,6 +671,7 @@ const oncopyup = () => {
 	copySelection.value.forEach(subArr => {
 	    subArr.old_time = formData.value.old_time;
 	    subArr.new_time = formData.value.new_time;
+	    subArr.sys_id = sys_id;
 	  });
 	copy(copySelection.value).then(response=>{
 		if (response.code === 0) {
@@ -678,6 +679,7 @@ const oncopyup = () => {
 			  type: 'success',
 			  message: '复制成功'
 			})
+			getTableData()
 			copyshow.value=false
 		}
 	})

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -823,7 +823,7 @@
                   <el-row>
                     <el-col :span="24">
                       <el-form-item label="客户编号:" prop="address" class="mab">
-                        <el-input v-model="formDataTest['客户编号']"  id="id1"   @blur="getCustominfo()"  @keydown="ent($event, '', 'id1', 'id2')" style="width: 150px;" />
+                        <el-input v-model="formDataTest['客户编号']"  id="id1" placeholder="Enter回车"   @blur="getCustominfo()"  @keydown="ent($event, '', 'id1', 'id2')" style="width: 150px;" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
@@ -1005,12 +1005,12 @@
                           <el-form :model="add_yjzlformdata" 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"  style="width: 140px;"  id="印件号"  @keydown="add_yinjian_ent($event, 'yj_desc', '印件号', '印件代号')" />
+                                <el-input v-model="add_yjzlformdata.yjno"   placeholder="Enter回车"  style="width: 140px;"  id="印件号"  @keydown="add_yinjian_ent($event, 'yj_desc', '印件号', '印件代号')" />
                               </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"  style="width: 140px;"  id="印件代号" @keydown="add_yinjian_ent($event, '印件号', '印件代号', 'yj_zzdh')"  />
+                                <el-input v-model="add_yjzlformdata.yjdh" placeholder="Enter回车"  style="width: 140px;"  id="印件代号" @keydown="add_yinjian_ent($event, '印件号', '印件代号', 'yj_zzdh')"  />
                               </el-form-item>
                             </el-row>
                             <el-row>
@@ -1024,7 +1024,7 @@
                               <el-col :span="24">
                                 <el-form-item label="纸张:" prop="address" class="mab" label-width="100px">
                                   <el-row>
-                                   <el-input v-model="add_yjzlformdata.zzdh"  class="zhi" id="zzdh" @keydown="add_gdzlyjent($event, '印件名称', 'zzdh', 'zzmc',0)"   style="width: 140px;"/>
+                                   <el-input v-model="add_yjzlformdata.zzdh"  placeholder="Enter回车"   class="zhi" id="zzdh" @keydown="add_gdzlyjent($event, '印件名称', 'zzdh', 'zzmc',0)"   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>
@@ -1032,7 +1032,7 @@
                               <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"   style="width: 140px;"  id="zzdh1" @keydown="add_gdzlyjent($event, 'zzmc', 'zzdh1', 'zzmc1',1)"  />
+                                    <el-input v-model="add_yjzlformdata.zzdh1"  placeholder="Enter回车"  style="width: 140px;"  id="zzdh1" @keydown="add_gdzlyjent($event, 'zzmc', 'zzdh1', 'zzmc1',1)"  />
                                     <el-input v-model="add_yjzlformdata.zzmc1"   style="width: 460px;" id="zzmc1"  @keydown="add_gdzlyjent($event, 'zzdh1', 'zzmc1', 'zzdh2')" />
                                   </el-row>
                                 </el-form-item>
@@ -1040,7 +1040,7 @@
                               <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"  style="width: 140px;"  id="zzdh2"  @keydown="add_gdzlyjent($event, 'zzmc1', 'zzdh2', 'zzmc2',2)" />
+                                    <el-input v-model="add_yjzlformdata.zzdh2"  placeholder="Enter回车"  style="width: 140px;"  id="zzdh2"  @keydown="add_gdzlyjent($event, 'zzmc1', 'zzdh2', 'zzmc2',2)" />
                                     <el-input v-model="add_yjzlformdata.zzmc2"   style="width: 460px;" id="zzmc2"  @keydown="add_gdzlyjent($event, 'zzdh2', 'zzmc2', 'zzdh3')"  />
                                   </el-row>
                                 </el-form-item>
@@ -1048,7 +1048,7 @@
                               <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"  style="width: 140px;"  id="zzdh3"  @keydown="add_gdzlyjent($event, 'zzmc2', 'zzdh3', 'zzmc3',3)"  />
+                                    <el-input  v-model="add_yjzlformdata.zzdh3"  placeholder="Enter回车"  style="width: 140px;"  id="zzdh3"  @keydown="add_gdzlyjent($event, 'zzmc2', 'zzdh3', 'zzmc3',3)"  />
                                     <el-input v-model="add_yjzlformdata.zzmc3"   style="width: 460px;" id="zzmc3"  @keydown="add_gdzlyjent($event, 'zzdh3', 'zzmc3', 'zzdh4')"  />
                                   </el-row>
                                 </el-form-item>
@@ -1056,7 +1056,7 @@
                               <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"   style="width: 140px;"  id="zzdh4" @keydown="add_gdzlyjent($event, 'zzmc3', 'zzdh4', 'zzmc4',4)" />
+                                    <el-input v-model="add_yjzlformdata.zzdh4"   placeholder="Enter回车"  style="width: 140px;"  id="zzdh4" @keydown="add_gdzlyjent($event, 'zzmc3', 'zzdh4', 'zzmc4',4)" />
                                     <el-input v-model="add_yjzlformdata.zzmc4"   style="width: 460px;" id="zzmc4"  @keydown="add_gdzlyjent($event, 'zzdh4', 'zzmc4', 'yj_tlgg')"  />
                                   </el-row>
                                 </el-form-item>
@@ -1170,7 +1170,7 @@
                   <el-row>
                     <el-col :span="6">
                       <el-form-item label="车间名称:" prop="address" class="mab">
-                        <el-input v-model="add_gyformData.Gy0_site" id="车间名称" @keydown="ent($event, 'Gy0_ls', '车间名称', 'gy0_gxmc')" style="width: 140px;"  />
+                        <el-input v-model="add_gyformData.Gy0_site" placeholder="Enter回车" id="车间名称" @keydown="ent($event, 'Gy0_ls', '车间名称', 'gy0_gxmc')" style="width: 140px;"  />
                       </el-form-item>
                     </el-col>
                     <el-col :span="6">
@@ -1202,7 +1202,7 @@
 
                   <el-row>
                       <el-form-item label="标准损耗:" prop="address" class="mab">
-                        <el-input v-model="add_gyformData.Gy0_shdh"  @keyup.enter="getSH()"   style="width: 150px;" id="Gy0_shdh" />
+                        <el-input v-model="add_gyformData.Gy0_shdh" placeholder="Enter回车"  @keyup.enter="getSH()"   style="width: 150px;" id="Gy0_shdh" />
                         <el-input v-model="add_gyformData.sys_mc"   style="width: 160px;" id="sys_mc"  @keydown="ent($event, 'Gy0_shdh', 'sys_mc', '基础损耗')"/>
                       </el-form-item>
                       <el-form-item label="基础损耗:" prop="address" class="mab">
@@ -3251,8 +3251,19 @@ const _getSH = async () => {
     console.error('获取损耗列表失败');
   }
 };
+
+const focusNextInput = (nextInputId) => {
+      const nextInput = document.getElementById(nextInputId);
+      if (nextInput) {
+        nextInput.focus();
+      }
+    };
+
+
 //损耗树形结构点击
 const selectSHNode = (node,check) => {
+	console.log(111111)
+	 focusNextInput('sys_mc'); 
    if(node.level==1){
    	console.log(node.label)
    }
@@ -3263,6 +3274,7 @@ const selectSHNode = (node,check) => {
 	add_gyformData.sys_rate1 = node.sys_rate1
 	searchSHModel.value = false;
    }
+ 
 }
 // const processData = (data) => {
 //   const map = {};

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

@@ -6,7 +6,7 @@
         <div>
           <div style="display: flex; gap: 0px;">
             <el-form-item label="印件编号:"  class="mab" prop="keyOrder">
-              <el-input v-model="form.yjno" id="印件编号" @keydown="add_gyzlent($event, '质量隐患', '印件编号', '工序编号')"  style="width: 100px;"/>
+              <el-input v-model="form.yjno"  placeholder="Enter回车"  id="印件编号" @keydown="add_gyzlent($event, '质量隐患', '印件编号', '工序编号')"  style="width: 100px;"/>
             </el-form-item>
             <el-form-item label="工序编号:" class="mab" prop="keyOrder" label-width=" 90">
               <el-input v-model="form['工序']"  id="工序编号" @keydown="add_gyzlent($event, '印件编号', '工序编号', '重点工序')"  style="width: 100px;"/>
@@ -29,13 +29,13 @@
           </div>
           <div style="display: flex; gap: 0px;">
             <el-form-item label="车间名称:"  class="mab" prop="keyOrder">
-              <el-input v-model="form['车间名称']" id="车间名称" style="width: 140px;" @keydown="add_gyzlent($event, '联数', '车间名称', '工序名称')"/>
+              <el-input v-model="form['车间名称']" placeholder="Enter回车" id="车间名称" style="width: 140px;" @keydown="add_gyzlent($event, '联数', '车间名称', '工序名称')"/>
             </el-form-item>
             <el-form-item label="工艺名称:"  class="mab" prop="keyOrder" label-width=" 90">
               <el-input disabled v-model="form['工艺名称']"  style="width: 140px;"/>
             </el-form-item>
             <el-form-item label="工序名称:"  class="mab" prop="keyOrder" label-width=" 90">
-              <el-input  v-model="form['工序名称']"  style="width: 300px;" id="工序名称"   @keydown="add_gyzlent($event, '车间名称', '工序名称', '设备编号')" />
+              <el-input  v-model="form['工序名称']"  placeholder="Enter回车"  style="width: 300px;" id="工序名称"   @keydown="add_gyzlent($event, '车间名称', '工序名称', '设备编号')" />
             </el-form-item>
             <el-form-item label="计损色数"  class="mab" prop="keyOrder" label-width=" 80">
               <el-input  v-model="form['计损色数']" style="width: 90px;"/>
@@ -57,7 +57,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="工序损耗:"  class="mab" prop="keyOrder" >
-            <el-input v-model="form['shdh']"  style="width: 10%;" id="工序损耗"  @keydown="add_gyzlent($event, '设备编号', '工序损耗', '损耗系数')"/>
+            <el-input v-model="form['shdh']"  placeholder="Enter回车"  style="width: 10%;" id="工序损耗"  @keydown="add_gyzlent($event, '设备编号', '工序损耗', '损耗系数')"/>
             <el-input disabled v-model="form['工序损耗名称']"  style="width: 88.7%;margin-left: 10px"/>
           </el-form-item>
           <div style="display: flex; gap: 0px;">

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -142,9 +142,9 @@
             <div style=" padding: 0px; align-items: center;">
               <el-form-item label="工单编号" prop="processName" class="mab">
 <!--                @click="yycpzlProductValue({ code: 'Tab'})"-->
-                <el-input v-model="yycpzlformData['gdbh']" ref="fanganRef"  @keydown="yycpzlProductValue" style="width: 23%;" />
+                <el-input v-model="yycpzlformData['gdbh']" placeholder="Enter回车" ref="fanganRef"  @keydown="yycpzlProductValue" style="width: 23%;" />
 <!--                <el-button type="primary" @click="yycppshuaxin_click" style="margin-left: 10px">刷新</el-button>-->
-                &nbsp;&nbsp;<span style="color:red">(模糊搜索工单编号或名称)</span>
+                &nbsp;&nbsp;<span style="color:red">(Enter回车 模糊搜索工单编号或名称)</span>
               </el-form-item>
               <el-form-item label="客户代号" prop="processName" class="mab">
                 <el-input v-model="yycpzlformData['khdh']" disabled style="width: 23%;" />
@@ -270,7 +270,7 @@
             <div>
               <div style="align-items: center;">
                 <el-form-item label="当前工单:" prop="currentProcess" class="mab">
-                  <el-input v-model="gylctzformData['gdbh']"  @keyup.enter="gylctzProductValue"  placeholder="" style="width: 160px;margin: 10px"/>
+                  <el-input v-model="gylctzformData['gdbh']"  @keyup.enter="gylctzProductValue"  placeholder="Enter回车" style="width: 160px;margin: 10px"/>
                   <el-input v-model="gylctzformData['gddh']"  disabled   style="width: 170px;margin-left: 10px;margin: 10px"/>
                   <el-input v-model="gylctzformData['gdmc']"  disabled   style="width: 340px;margin-left: 10px;margin: 10px"/>
                 </el-form-item>
@@ -825,7 +825,7 @@
                   </el-row>
                   <el-row :gutter="24">
                     <el-form-item label="客户代号:" prop="customerCode" class="mab" label-width="90">
-                      <el-input v-model="add_gdscgdformData['客户代号']" style="width: 110px;" id="客户代号"  @keydown="add_gdzlent($event, '生产类型', '客户代号', '客户名称')"/>
+                      <el-input v-model="add_gdscgdformData['客户代号']" placeholder="Enter回车" style="width: 110px;" id="客户代号"  @keydown="add_gdzlent($event, '生产类型', '客户代号', '客户名称')"/>
                     </el-form-item>
                     <el-form-item label="客户名称:" prop="customerName" class="mab" label-width="75">
                       <el-input v-model="add_gdscgdformData['客户名称']" style="width: 520px;" id="客户名称"  @keydown="add_gdzlent($event, '客户代号', '客户名称', '产品代号')"/>
@@ -833,7 +833,7 @@
                   </el-row>
                   <el-row :gutter="24">
                     <el-form-item label="产品代码:" prop="productCode" class="mab" label-width="90">
-                      <el-input v-model="add_gdscgdformData['产品代号']" style="width: 110px;" id="产品代号"  @keydown="add_gdzlent($event, '客户名称', '产品代号', '产品名称')"/>
+                      <el-input v-model="add_gdscgdformData['产品代号']" placeholder="Enter回车" style="width: 110px;" id="产品代号"  @keydown="add_gdzlent($event, '客户名称', '产品代号', '产品名称')"/>
                     </el-form-item>
                     <el-form-item label="产品名称:" prop="productName" class="mab" label-width="75">
                       <el-input v-model="add_gdscgdformData['产品名称']" style="width: 520px;"  id="产品名称"  @keydown="add_gdzlent($event, '产品代号', '产品名称', '印件代号')" />
@@ -1075,27 +1075,27 @@
                   <el-input v-model="add_yjzlformdata.yjno" placeholder="" style="width: 140px;" id="yjno"  @keydown="add_gdzlyjent($event, 'desc', 'yjno', 'yjdh')"/>
                 </el-form-item>
                 <el-form-item label="印件代码:" class="mab" prop="keyOrder">
-                  <el-input v-model="add_yjzlformdata.yjdh" id="yjdh"  @keydown="add_gdzlyjent($event, 'yjno', 'yjdh', 'yjmc')" style="width: 140px;"/>
+                  <el-input v-model="add_yjzlformdata.yjdh" id="yjdh" placeholder="Enter回车" @keydown="add_gdzlyjent($event, 'yjno', 'yjdh', 'yjmc')" style="width: 140px;"/>
                   <el-input v-model="add_yjzlformdata.yjmc" id="yjmc" @keydown="add_gdzlyjent($event, 'yjdh', 'yjmc', 'zzdh')" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
                 <el-form-item label="纸张编号:" class="mab" prop="keyOrder">
-                  <el-input v-model="add_yjzlformdata.zzdh"  class="zhi" id="zzdh" @keydown="add_gdzlyjent($event, 'yjmc', 'zzdh', 'zzmc',0)"  placeholder="" style="width: 140px;"/>
+                  <el-input v-model="add_yjzlformdata.zzdh"  class="zhi" id="zzdh" @keydown="add_gdzlyjent($event, 'yjmc', 'zzdh', 'zzmc',0)" placeholder="Enter回车"style="width: 140px;"/>
                   <el-input v-model="add_yjzlformdata.zzmc"  id="zzmc" @keydown="add_gdzlyjent($event, 'zzdh', 'zzmc', 'zzdh1')" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
                 <el-form-item label="备用纸张1:" class="mab" prop="keyOrder">
-                  <el-input v-model="add_yjzlformdata.zzdh1" class="zhi" id="zzdh1" @keydown="add_gdzlyjent($event, 'zzmc', 'zzdh1', 'zzmc1',1)" style="width: 140px;"/>
+                  <el-input v-model="add_yjzlformdata.zzdh1" placeholder="Enter回车" class="zhi" id="zzdh1" @keydown="add_gdzlyjent($event, 'zzmc', 'zzdh1', 'zzmc1',1)" style="width: 140px;"/>
                   <el-input v-model="add_yjzlformdata.zzmc1"  id="zzmc1" @keydown="add_gdzlyjent($event, 'zzdh1', 'zzmc1', 'zzdh2')"  style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
                 <el-form-item label="备用纸张2:" class="mab" prop="keyOrder">
-                  <el-input v-model="add_yjzlformdata.zzdh2" class="zhi" id="zzdh2" @keydown="add_gdzlyjent($event, 'zzmc1', 'zzdh2', 'zzmc2',2)" style="width: 140px;"/>
+                  <el-input v-model="add_yjzlformdata.zzdh2" placeholder="Enter回车" class="zhi" id="zzdh2" @keydown="add_gdzlyjent($event, 'zzmc1', 'zzdh2', 'zzmc2',2)" style="width: 140px;"/>
                   <el-input v-model="add_yjzlformdata.zzmc2"  id="zzmc2" @keydown="add_gdzlyjent($event, 'zzdh2', 'zzmc2', 'zzdh3')" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
                 <el-form-item label="备用纸张3:" class="mab" prop="keyOrder">
-                  <el-input v-model="add_yjzlformdata.zzdh3" class="zhi" id="zzdh3" @keydown="add_gdzlyjent($event, 'zzmc2', 'zzdh3', 'zzmc3',3)" style="width: 140px;"/>
+                  <el-input v-model="add_yjzlformdata.zzdh3" placeholder="Enter回车" class="zhi" id="zzdh3" @keydown="add_gdzlyjent($event, 'zzmc2', 'zzdh3', 'zzmc3',3)" style="width: 140px;"/>
                   <el-input v-model="add_yjzlformdata.zzmc3" id="zzmc3" @keydown="add_gdzlyjent($event, 'zzdh3', 'zzmc3', 'zzdh4')" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
                 <el-form-item label="备用纸张4:" class="mab" prop="keyOrder">
-                  <el-input v-model="add_yjzlformdata.zzdh4"  class="zhi" id="zzdh4" @keydown="add_gdzlyjent($event, 'zzmc3', 'zzdh4', 'zzmc4',4)" style="width: 140px;"/>
+                  <el-input v-model="add_yjzlformdata.zzdh4" placeholder="Enter回车" class="zhi" id="zzdh4" @keydown="add_gdzlyjent($event, 'zzmc3', 'zzdh4', 'zzmc4',4)" style="width: 140px;"/>
                   <el-input v-model="add_yjzlformdata.zzmc4" id="zzmc4" @keydown="add_gdzlyjent($event, 'zzdh4', 'zzmc4', 'cpsl')" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
                 <div style="display: flex; gap: 0px;">

src/view/yunyin/shengchanguanli/shengchanjincheng.vue

@@ -6,7 +6,7 @@
           <!--          按钮部分-->
           <el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
             <el-form-item>
-              <el-input v-model="searchInfo" placeholder="搜索员工编号或员工姓名" clearable style="width: 200px;margin: 5px"></el-input>
+              <el-input v-model="searchInfo" placeholder="搜索工单编号" clearable style="width: 200px;margin: 5px"></el-input>
               <el-button type="primary" icon="search" @click="onSubmit" style="margin: 5px">查询</el-button>
 			  <!-- <el-button type="primary" icon="edit"   @click="gd_gxcltjonClick"  class="bt" title="工序产量核查">工序产量统计</el-button> -->
 			  <el-button type="primary" icon="edit"   @click="cp_gdprintonClick" class="bt" title="打印生产工单" >工单打印</el-button>