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

src/view/job/dictionaries/dictionaries.vue

@@ -3,7 +3,7 @@
     <el-container>
       <el-aside width="350px">
         <div class="JKWTree-tree">
-          <h3>计件定额管理</h3>
+          <h3>其他常用字典查询</h3>
           <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
         </div>
       </el-aside>
@@ -29,63 +29,71 @@
                 <el-button icon="refresh" @click="onReset">重置</el-button>
               </el-form-item>
             </el-form> -->
-			<div class="gva-btn-list">
-			  <el-button type="primary" icon="upload" @click="bacthEditClick">定额参数批量修改excel</el-button>
-			  <el-button type="primary" icon="plus" @click="bacthSubmit">更新</el-button>
-			</div>
-          </div>
-          <div class="gva-table-box">
-            <!-- <div class="gva-btn-list">
-			  <el-button type="primary" icon="upload" @click="">导出到excel</el-button>
-			  <el-button type="primary" icon="plus" @click="getDetails(2)">详情</el-button>
-            </div> -->
-            <el-table
-                ref="multipleTable"
-				stripe
-            	border
-                style="width: 100%"
-                tooltip-effect="dark"
-                :data="tableData"
-                row-key="ID"
-                @selection-change="handleSelectionChange"
-            	@row-dblclick="updateCompanyFunc"
-            	:show-overflow-tooltip="true"
-            	highlight-current-row="true"
-            >
-              <el-table-column align="left" label="定额代号" prop="sys_bh" width="120" />
-              <el-table-column align="left" label="名称备注" prop="sys_mc" width="210" />
-              <el-table-column align="left" label="使用工序" prop="use_gx" width="88" />
-			  <el-table-column align="left" label="适用机型" prop="use_machine" width="88" />
-			  <el-table-column fixed="right" v-slot="scope" align="left" label="日定额" width="100" >
-			      <el-input @input="inputClick" v-model="scope.row.daily_quota" :clearable="false"/>
-			  </el-table-column>
-			  <el-table-column fixed="right" v-slot="scope" align="left" label="千件工价" width="100" >
-			      <el-input @input="inputClick" v-model="scope.row.thousand_piece" :clearable="false"/>
-			  </el-table-column>
-			  <el-table-column fixed="right" v-slot="scope" align="left" label="补产标准" width="100" >
-			      <el-input @input="inputClick" v-model="scope.row.production_standard" :clearable="false"/>
-			  </el-table-column>
-			 <!-- <el-table-column align="left" label="原日定额" prop="daily_quota" width="90" />
-			  <el-table-column align="left" label="原千件工价" prop="thousand_piece" width="100" />
-			  <el-table-column align="left" label="原补产标准" prop="production_standard" width="100" /> -->
-			 <!-- <el-table-column fixed="right" v-slot="scope" align="left" label="新日定额" width="100" >
-			      <el-input @input="inputClick" v-model="scope.row.daily_quota" :clearable="false"/>
-			  </el-table-column>
-			  <el-table-column fixed="right" v-slot="scope" align="left" label="新千件工价" width="100" >
-			      <el-input @input="inputClick" v-model="scope.row.thousand_piece" :clearable="false"/>
-			  </el-table-column>
-			  <el-table-column fixed="right" v-slot="scope" align="left" label="新补产标准" width="100" >
-			      <el-input @input="inputClick" v-model="scope.row.production_standard" :clearable="false"/>
-			  </el-table-column> -->
-			  <!-- <el-table-column v-slot="scope" align="left" label="新补产标准" width="100">
-				  	<el-form-item :prop="'tableData.'+scope.row+'.production_standard'">
-				  		<el-input v-model="scope.row.production_standard" :clearable="true"/>
-				  	</el-form-item>
-              </el-table-column> -->
-			  <el-table-column v-slot="scope" v-if="false" align="left" label="UniqId" width="100" >
-			      <el-input v-model="scope.row.UniqId" :clearable="false"/>
-			  </el-table-column>
-            </el-table>
+
+
+<!--			<div class="gva-btn-list">-->
+<!--			  <el-button type="primary" icon="upload" @click="bacthEditClick">定额参数批量修改excel</el-button>-->
+<!--			  <el-button type="primary" icon="plus" @click="bacthSubmit">更新</el-button>-->
+<!--			</div>-->
+<!--          </div>-->
+<!--          <div class="gva-table-box">-->
+<!--            &lt;!&ndash; <div class="gva-btn-list">-->
+<!--			  <el-button type="primary" icon="upload" @click="">导出到excel</el-button>-->
+<!--			  <el-button type="primary" icon="plus" @click="getDetails(2)">详情</el-button>-->
+<!--            </div> &ndash;&gt;-->
+<!--            <el-table-->
+<!--                ref="multipleTable"-->
+<!--				stripe-->
+<!--            	border-->
+<!--                style="width: 100%"-->
+<!--                tooltip-effect="dark"-->
+<!--                :data="tableData"-->
+<!--                row-key="ID"-->
+<!--                @selection-change="handleSelectionChange"-->
+<!--            	@row-dblclick="updateCompanyFunc"-->
+<!--            	:show-overflow-tooltip="true"-->
+<!--            	highlight-current-row="true"-->
+<!--            >-->
+<!--              <el-table-column align="left" label="定额代号" prop="sys_bh" width="120" />-->
+<!--              <el-table-column align="left" label="名称备注" prop="sys_mc" width="210" />-->
+<!--              <el-table-column align="left" label="使用工序" prop="use_gx" width="88" />-->
+<!--			  <el-table-column align="left" label="适用机型" prop="use_machine" width="88" />-->
+<!--			  <el-table-column fixed="right" v-slot="scope" align="left" label="日定额" width="100" >-->
+<!--			      <el-input @input="inputClick" v-model="scope.row.daily_quota" :clearable="false"/>-->
+<!--			  </el-table-column>-->
+<!--			  <el-table-column fixed="right" v-slot="scope" align="left" label="千件工价" width="100" >-->
+<!--			      <el-input @input="inputClick" v-model="scope.row.thousand_piece" :clearable="false"/>-->
+<!--			  </el-table-column>-->
+<!--			  <el-table-column fixed="right" v-slot="scope" align="left" label="补产标准" width="100" >-->
+<!--			      <el-input @input="inputClick" v-model="scope.row.production_standard" :clearable="false"/>-->
+<!--			  </el-table-column>-->
+<!--			 &lt;!&ndash; <el-table-column align="left" label="原日定额" prop="daily_quota" width="90" />-->
+<!--			  <el-table-column align="left" label="原千件工价" prop="thousand_piece" width="100" />-->
+<!--			  <el-table-column align="left" label="原补产标准" prop="production_standard" width="100" /> &ndash;&gt;-->
+<!--			 &lt;!&ndash; <el-table-column fixed="right" v-slot="scope" align="left" label="新日定额" width="100" >-->
+<!--			      <el-input @input="inputClick" v-model="scope.row.daily_quota" :clearable="false"/>-->
+<!--			  </el-table-column>-->
+<!--			  <el-table-column fixed="right" v-slot="scope" align="left" label="新千件工价" width="100" >-->
+<!--			      <el-input @input="inputClick" v-model="scope.row.thousand_piece" :clearable="false"/>-->
+<!--			  </el-table-column>-->
+<!--			  <el-table-column fixed="right" v-slot="scope" align="left" label="新补产标准" width="100" >-->
+<!--			      <el-input @input="inputClick" v-model="scope.row.production_standard" :clearable="false"/>-->
+<!--			  </el-table-column> &ndash;&gt;-->
+<!--			  &lt;!&ndash; <el-table-column v-slot="scope" align="left" label="新补产标准" width="100">-->
+<!--				  	<el-form-item :prop="'tableData.'+scope.row+'.production_standard'">-->
+<!--				  		<el-input v-model="scope.row.production_standard" :clearable="true"/>-->
+<!--				  	</el-form-item>-->
+<!--              </el-table-column> &ndash;&gt;-->
+<!--			  <el-table-column v-slot="scope" v-if="false" align="left" label="UniqId" width="100" >-->
+<!--			      <el-input v-model="scope.row.UniqId" :clearable="false"/>-->
+<!--			  </el-table-column>-->
+<!--            </el-table>-->
+
+
+
+
+
+
             <!-- <div class="gva-pagination">
               <el-pagination
                   layout="total, sizes, prev, pager, next, jumper"
@@ -276,7 +284,7 @@ const treeTab = async() => {
 		  label:item,
 		  cate:`民族`
 	  }))
-	   
+
 	   for(let key in dictionaryTabs.data.标准工艺){
 	   		  gystr+=key+'-'
 			  for(let keys in dictionaryTabs.data.标准工艺[key]){
@@ -294,7 +302,7 @@ const treeTab = async() => {
 			   cate:`标准工艺`,
 	    }))
 	    }))
-		
+
 		for(let key in dictionaryTabs.data.废品分类){
 				  fpstr+=key+'+'
 					  for(let keys in dictionaryTabs.data.废品分类[key]){
@@ -312,7 +320,7 @@ const treeTab = async() => {
 					   cate:`废品分类`,
 		 }))
 		 }))
-	   
+
 	   for(let key in dictionaryTabs.data.工资表){
 	   		  gzstr+=key+','
 	   }
@@ -322,7 +330,7 @@ const treeTab = async() => {
 	   		  label:item,
 	   		  cate:`工资表`
 	   }))
-	   
+
 	   for(let key in dictionaryTabs.data.级别){
 	   		  jbstr+=key+','
 	   }
@@ -332,7 +340,7 @@ const treeTab = async() => {
 	   		  label:item,
 	   		  cate:`级别`
 	   }))
-	   
+
 	   for(let key in dictionaryTabs.data.学历){
 	   		  xlstr+=key+','
 	   }
@@ -345,7 +353,7 @@ const treeTab = async() => {
 	  //  console.log(dictionaryTabs.data.标准工艺.外发加工.map(items=>({
 		 //   lable:items
 	  //  })))
-	  
+
 	  //  const 标准工艺=gyarr.map(item=>({
 	  //  		  lable:item,
 	  //  		  cate:`标准工艺`,
@@ -509,7 +517,7 @@ const bacthSubmit = async() => {
 		}
 		// console.log(tableData.value)
 	}
-	
+
 }
 // 查询
 // const getTableData = async() => {

src/view/job/processSheet/processSheet.vue

@@ -157,7 +157,8 @@
 	const selectedPeijian = ref([])
 	const datas = ref([])
 	const propertyChange = () => {
-		if(workData.value.Gd_gdbh.length!==7){
+		if(workData.value.Gd_gdbh.length<7){
+      console.log("没到七位")
 			shuang.value=false
 			selectedPaper.value=[]
 			selectedPeijian.value=[]
@@ -171,8 +172,10 @@
 			department.value=null
 			return false;
 		}else{
+      console.log("到了七位")
       const getDocument = async() => {
         const getDocumentDatas = await getDocumentData({order:workData.value.Gd_gdbh})
+        console.log(getDocumentDatas)
         if (getDocumentDatas.code === 0) {
           workData.value.version=getDocumentDatas.data.paper[0].产品版本号;
           workData.value.peijian=getDocumentDatas.data.paper;

src/view/yunyin/shengchanguanli/gongdanziliao.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="搜索工单编号、产品代号" style="width: 180px;"></el-input>
+              <el-input v-model="searchInfo"  placeholder="搜索工单编号、产品代号" style="width: 180px;" @keyup.enter.native="handleSearch"></el-input>
               <el-button type="primary" icon="search" @click="onSubmit" title="搜索"  ></el-button>
               <el-button type="primary" icon="edit"   @click="ontlssclick"       class="bt" title="按工序投料反馈，试算某产量的投料">U8投料试算</el-button>
               <el-button type="primary" class="bt" icon="edit"  @click="jsfjClick">技术附件</el-button>
@@ -467,8 +467,8 @@
                 <el-table-column align="left" sortable label="工单编号"   prop="工单编号"  width="110" />
                 <el-table-column align="left" sortable label="生产分类"   prop="生产分类" width="110" />
                 <el-table-column align="left" sortable label="销售订单号" prop="销售订单号" width="120" />
-                <el-table-column align="left" sortable label="产品代号"   prop="产品代号"  width="110" />
-                <el-table-column align="left" sortable label="产品名称"   prop="产品名称" width="370" />
+                <el-table-column align="left" sortable label="成品代号"   prop="产品代号"  width="110" />
+                <el-table-column align="left" sortable label="成品名称"   prop="产品名称" width="370" />
                 <el-table-column align="left" sortable label="订单数量"   prop="订单数量" width="110" />
                 <el-table-column align="left" sortable label="单位"       prop="单位"   width="100"/>
                 <el-table-column align="left" sortable label="折合大箱"   prop="折合大箱" width="110" />
@@ -3059,6 +3059,11 @@ const searchInfo = ref('')
 const onSubmit = () => {
   _cha_WorkList();
 };
+const handleSearch = () => {
+  console.log(1231)
+  _cha_WorkList();
+};
+
 const _cha_WorkList = async (node) => {
   if(searchInfo.value === ''){
     ElMessage({type: 'warning',message: '请输入搜索的信息'})