liuhairui 1 рік тому
батько
коміт
5a5b158ae3

+ 33 - 33
src/view/yunyin/shengchanguanli/yangyipihe.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;"></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>
@@ -26,7 +26,7 @@
   
 		  <!-- 右侧区域 -->
 		  <layout-content >
-		  <el-main>
+		  <!-- <el-main> -->
 			<div class="gva-table-box">
 			  <!-- 表格数据 -->
 			  <el-tabs v-model="activeName">
@@ -37,31 +37,31 @@
 							 @row-click="yydp_clickybupdate"
                         	 @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">
-						<el-table-column align="center" type="selection" width="30"/>
-						<el-table-column  sortable align="center" label="订单编号" prop="订单编号"  width="120" />
-						<el-table-column  sortable align="center" label="客户" prop="客户编号"  width="110" />
-						<!-- <el-table-column  sortable align="center" label="颜色名称" prop="颜色名称"  width="120" /> -->
-						<el-table-column  sortable align="center" label="生产款号" prop="生产款号"  width="220" />
-						<el-table-column  sortable align="center" label="款式" prop="款式"  width="100" />
-						<el-table-column  sortable align="center" label="工单状态" prop="gd_statu"  width="120" />
-						<el-table-column  sortable align="center" label="船样描述" prop="船样描述"  width="200" />
-						<el-table-column  sortable align="center" label="船样合计" prop="船样合计"  width="120" />
-						<el-table-column  sortable align="center" label="要求" prop="要求"  width="420" />
-						<el-table-column  sortable align="center" label="箱唛要求" prop="箱唛要求"  width="510" />
-						<el-table-column  sortable align="center" label="粘衬" prop="粘衬"  width="120" />
-						<el-table-column  sortable align="center" label="订单数量" prop="订单数量"  width="120" />
-						<el-table-column  sortable align="center" label="单位" prop="单位"  width="120" />
-						<el-table-column  sortable align="center" label="工单完工数量" prop="工单完工数量"  width="140" />
-						<el-table-column  sortable align="center" label="工单完工日期" prop="工单完工日期"  width="140" />
-						<el-table-column  sortable align="center" label="建档用户" prop="Sys_id"  width="120" />
-						<el-table-column  sortable align="center" label="建档日期" prop="Sys_rq"  width="120" />
-						<el-table-column  sortable align="center" label="接单日期" prop="接单日期"  width="120" />
-						<el-table-column  sortable align="center" label="出库日期" prop="出库日期"  width="120" />
-						<el-table-column  sortable align="center" label="落货日期" prop="落货日期"  width="120" />
-						<el-table-column  sortable align="center" label="更新时间" prop="Mod_rq"  width="120" />
-						<el-table-column  sortable align="center" label="审核" prop="审核"  width="100" />
-						<el-table-column  sortable align="center" label="审核日期" prop="审核日期"  width="120" />
+						<el-table-column align="center" type="selection" width="40"/>
+						<el-table-column  sortable align="left" label="订单编号" prop="订单编号"  width="110" />
+						<el-table-column  sortable align="left" label="客户" prop="客户编号"  width="80" />
+						<el-table-column  sortable align="left" label="生产款号" prop="生产款号"  width="200" />
+						<el-table-column  sortable align="left" label="款式" prop="款式"  width="80" />
+						<el-table-column  sortable align="left" label="工单状态" prop="gd_statu"  width="105" />
+						<el-table-column  sortable align="left" label="船样描述" prop="船样描述"  width="200" />
+						<el-table-column  sortable align="left" label="船样合计" prop="船样合计"  width="105" />
+						<el-table-column  sortable align="left" label="订单数量" prop="订单数量"  width="120" />
+						<el-table-column  sortable align="left" label="单位" prop="单位"  width="80" />
+						<el-table-column  sortable align="left" label="粘衬" prop="粘衬"  width="80" />
+						<el-table-column  sortable align="left" label="要求" prop="要求"  width="360" />
+						<el-table-column  sortable align="left" label="箱唛要求" prop="箱唛要求"  width="360" />
+						<el-table-column  sortable align="left" label="工单完工数量" prop="工单完工数量"  width="140" />
+						<el-table-column  sortable align="left" label="工单完工日期" prop="工单完工日期"  width="140" />
+						<el-table-column  sortable align="left" label="建档用户" prop="Sys_id"  width="120" />
+						<el-table-column  sortable align="left" label="建档日期" prop="Sys_rq"  width="120" />
+						<el-table-column  sortable align="left" label="接单日期" prop="接单日期"  width="120" />
+						<el-table-column  sortable align="left" label="出库日期" prop="出库日期"  width="120" />
+						<el-table-column  sortable align="left" label="落货日期" prop="落货日期"  width="120" />
+						<el-table-column  sortable align="left" label="更新时间" prop="Mod_rq"  width="120" />
+						<el-table-column  sortable align="left" label="审核" prop="审核"  width="100" />
+						<el-table-column  sortable align="left" label="审核日期" prop="审核日期"  width="120" />
 					</el-table>
 				</el-tab-pane>
 
@@ -104,7 +104,7 @@
 			  </div>
 			</div>
   
-		  </el-main>
+		  <!-- </el-main> -->
 		</layout-content>
 		</layout>
 	  </layout>
@@ -278,15 +278,15 @@ const yyyp_updateCompanyFunc = async (row) => {
 // 搜索默认为空
 const searchInfo = ref('')
 const table_Selection = ref(false)
-//点击【查询按钮
+//查询按钮
 const onSubmit = async ()  => {
 	if(searchInfo.value === ''){
-		const UnapprovalListtable = await UnapprovalList({search:''});
+		ElMessage({type: 'warning',message: '请输入搜索的订单编号' })
+		return false;
+	}else{
+		const UnapprovalListtable = await UnapprovalList({search:searchInfo.value});
 		tableData1.splice(0,tableData1.length,...UnapprovalListtable.data);
-  }else{
-	const UnapprovalListtable = await UnapprovalList({search:searchInfo.value});
-	tableData1.splice(0,tableData1.length,...UnapprovalListtable.data);
-  }
+	}
 };
 
 //表格复选框

+ 1 - 1
src/view/yunyin/shengchanguanli/yuedudahuoshengchanjindu.vue

@@ -51,7 +51,7 @@
 			 			<el-table-column  sortable align="center" label="包装" prop="包装"  width="100" />
 			 			<el-table-column  sortable align="center" label="制单总数" prop="制单总数"  width="100" />
 			 			<el-table-column  sortable align="center" label="裁切总数" prop="裁切数量"  width="100" />	
-			 			<el-table-column  sortable align="center" label="出库日期" prop="出库日期"  width="160" />
+			 			<el-table-column  sortable align="center" label="出库日期" prop="出库日期"  width="110" />
 			  </el-table>
   
 			  <!-- 分页 -->