zck il y a 9 mois
Parent
commit
c1c592ecc4

+ 8 - 10
src/view/inventory/fabricsummary.vue

@@ -94,6 +94,7 @@ const mlscgdformData = reactive({
   日期: '',
 });
 
+
 //自动聚焦光标input
 const getMachineMacdata = async () => {
   mlscgdformData['日期'] = currentDates
@@ -108,11 +109,15 @@ const getMachineMacdata = async () => {
 }
 getMachineMacdata();
 
-
+  //日期转换
+let lhrq_formattedDeliveryDate = '';  //转化后的日期
+if (mlscgdformData['日期']) {  
+  const date = new Date(mlscgdformData['日期']);  
+  lhrq_formattedDeliveryDate = `${date.getFullYear()}-${('0' + (date.getMonth() + 1)).slice(-2)}`;  
+} 
 const fabricListdada = async () => {
-
 	//订单信息数据查询【接口】
-	const fabricListdata = await fabricList({mouth:currentDates});
+	const fabricListdata = await fabricList({mouth:lhrq_formattedDeliveryDate});
   console.log(fabricListdata)
 	restableData.splice(0,fabricListdata.length,...fabricListdata.data);
 }
@@ -128,13 +133,6 @@ const handleInput = async ()=>{
 //查询按钮
 const add_onSubmit = async ()=>{
 	restableData.splice(0, restableData.length);//清空表格
-  //日期转换
-  let lhrq_formattedDeliveryDate = '';  
-  if (mlscgdformData['日期']) {  
-    const date = new Date(mlscgdformData['日期']);  
-    lhrq_formattedDeliveryDate = `${date.getFullYear()}-${('0' + (date.getMonth() + 1)).slice(-2)}`;  
-  }  
-
 	//订单信息数据查询【接口】
 	const fabricListdata = await fabricList({mouth:lhrq_formattedDeliveryDate});
   console.log(fabricListdata)

+ 2 - 2
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -604,8 +604,8 @@
 				</el-table>
 			</div>
 			<div class="dialog-footer" style="text-align: right;margin-top: 5px;">
-			  <el-button @click="res_bomcloseDialog" style="width: 100px;height: 40px;">关闭</el-button>
-			  <el-button type="primary"  @click="res_bomenterDialog" style="width: 100px;height: 40px;">确认修改</el-button>
+			  <el-button @click="res_bomcloseDialog" style="width: 70px;height: 40px;">关闭</el-button>
+			  <el-button type="primary"  @click="res_bomenterDialog" style="width: 70px;height: 40px;">一键修改</el-button>
 			</div>
 		</el-dialog>
 		

+ 5 - 2
src/view/yunyin/shengchanguanli/yangyipihe.vue

@@ -6,11 +6,14 @@
 			<!--          按钮部分-->
 			<el-form ref="elSearchFormRef"   class="demo-form-inline" :rules="searchRule" >
 			  <el-form-item>
-				<el-input v-model="searchInfo" placeholder="搜索订单编号"  style="width: 180px;"></el-input>
+				<el-input v-model="searchInfo" placeholder="模糊搜索订单编号或者生产款号"  style="width: 220px;"></el-input>
 				<el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
 				<el-button type="primary" icon="edit"   @click="hptg_onClick" :disabled="table_Selection === false"  class="bt" title="核批通过">核批通过</el-button>
 			  </el-form-item>
+		<el-tag type="warning">附件状态带有“*”的代表未上传</el-tag>
+
 			</el-form>
+			
 		  </div>
 		</layout-header>
   
@@ -30,7 +33,7 @@
                         	 @row-dblclick="yydp_updateCompanyFunc"
 							 highlight-current-row="true"
 							 :show-overflow-tooltip="true"
-							style="width: 100%;height: 65vh" border  :data="tableData1" row-key="ID" @selection-change="handleSelectionChange">
+							style="width: 100%;height: 70vh" border  :data="tableData1" row-key="ID" @selection-change="handleSelectionChange">
 						<el-table-column   align="center" type="selection" width="40"/>
 						<el-table-column   align="center" label="技术附件状态" prop="status"  width="110" />
 						<el-table-column   align="center" label="订单附件状态" prop="orderstatus"  width="110" />