优化

src/view/inventory/fabricsummary.vue

@@ -2,9 +2,9 @@
   <div>
     <el-form>
         <el-form-item>
-          <el-input v-model="searchInfo" placeholder="搜索订单编号、款号、物料名称、颜色" @keyup.enter="handleSearch()" style="width: 260px;" />
- 		  <el-button type="primary" icon="search" class="search" @click="handleSearch">搜索</el-button>
-          <el-button  type="primary" icon="Download" @click="exportToExcel" style="margin: 5px;float: right;">导出库存Excel</el-button>
+          <el-input v-model="searchInfo" placeholder="搜索订单编号、款号、物料名称、颜色" @keyup.enter="handleSearch()" style="width: 460px;height: 50px;margin-left: 10px;" />
+ 		  <el-button type="primary" icon="search" class="search"style="height: 50px;font-size: 20px;margin-left: 20px;" @click="handleSearch">搜索</el-button>
+          <el-button  type="primary" icon="Download" @click="exportToExcel" style="height: 50px;font-size: 20px;margin-left: 20px;">导出库存Excel</el-button>
         </el-form-item>
     </el-form>
 
@@ -96,17 +96,20 @@
 					<el-table-column  align="left" label="客户编号" prop="客户编号" width="80" />
 					<el-table-column  align="left" label="生产款号" prop="生产款号" width="115" />
 					<el-table-column  align="left" label="款式" prop="款式" width="115" />
+					<el-table-column  align="left" label="颜色" prop="颜色" width="115" />
 					<el-table-column  align="left" label="物料名称" prop="物料名称" width="115" />
-					<!-- <el-table-column  align="left" label="计划用料" prop="计划用料" width="90" /> -->
-					<!-- <el-table-column  align="left" label="计划门幅" prop="计划门幅" width="90" /> -->
+					<el-table-column  align="left" label="计划用料" prop="计划用料" width="90" />
+					<el-table-column  align="left" label="计划门幅" prop="计划门幅" width="90" />
 					<el-table-column  align="left" label="定额用料" prop="定额用料" width="90" />
 					<el-table-column  align="left" label="定额门幅" prop="定额门幅" width="90" />
+					<el-table-column  align="left" label="实裁数量" prop="实裁数量" width="90" />
 					<el-table-column  align="left" label="入库数量" prop="入库数量" width="90" />
-					<el-table-column  align="left" label="入库总量" prop="入库总量" width="90" />
-					<el-table-column  align="left" label="库存数量" prop="面料结余" width="90" />
+					<el-table-column  align="left" label="入仓总量" prop="入仓总量" width="90" />
+					<el-table-column  align="left" label="面料结余" prop="面料结余" width="90" />
 					<el-table-column  align="left" label="投料单位" prop="投料单位" width="90" />
-					<el-table-column  align="left" label="入库人员" prop="入库人员" width="90" />
-					<el-table-column  align="left" label="入库时间" prop="入库时间" width="160" />
+					<el-table-column  align="left" label="操作人员" prop="操作人员" width="90" />
+					<el-table-column  align="left" label="操作时间" prop="操作时间" width="160" />
+					<el-table-column  align="left" label="来料选择" prop="来料部门" width="90" />
 					<el-table-column  align="left" label="备注" prop="备注" width="115" />
 					</el-table>
 				</el-tab-pane>
@@ -127,18 +130,21 @@
 					<el-table-column  align="left" label="客户编号" prop="客户编号" width="80" />
 					<el-table-column  align="left" label="生产款号" prop="生产款号" width="115" />
 					<el-table-column  align="left" label="款式" prop="款式" width="115" />
+					<el-table-column  align="left" label="颜色" prop="颜色" width="115" />
 					<el-table-column  align="left" label="物料名称" prop="物料名称" width="115" />
-					<!-- <el-table-column  align="left" label="计划用料" prop="计划用料" width="90" /> -->
-					<!-- <el-table-column  align="left" label="计划门幅" prop="计划门幅" width="90" /> -->
+					<el-table-column  align="left" label="计划用料" prop="计划用料" width="90" />
+					<el-table-column  align="left" label="计划门幅" prop="计划门幅" width="90" />
 					<el-table-column  align="left" label="定额用料" prop="定额用料" width="90" />
 					<el-table-column  align="left" label="定额门幅" prop="定额门幅" width="90" />
+					<el-table-column  align="left" label="实裁数量" prop="实裁数量" width="90" />
 					<el-table-column  align="left" label="出库数量" prop="出库数量" width="90" />
-					<el-table-column  align="left" label="入库总量" prop="入库总量" width="90" />
-					<el-table-column  align="left" label="库存数量" prop="面料结余" width="90" />
+					<el-table-column  align="left" label="领用数量" prop="领用数量" width="90" />
+					<el-table-column  align="left" label="入仓总量" prop="入仓总量" width="90" />
+					<el-table-column  align="left" label="面料结余" prop="面料结余" width="90" />
 					<el-table-column  align="left" label="投料单位" prop="投料单位" width="90" />
-					<el-table-column  align="left" label="出库人员" prop="出库人员" width="90" />
-					<el-table-column  align="left" label="出库时间" prop="出库时间" width="160" />
-					<el-table-column  align="left" label="领用人员" prop="领用人员" width="90" />
+					<el-table-column  align="left" label="操作人员" prop="操作人员" width="90" />
+					<el-table-column  align="left" label="操作时间" prop="操作时间" width="160" />
+					<el-table-column  align="left" label="部门选择" prop="来料部门" width="90" />
 					<el-table-column  align="left" label="备注" prop="备注" width="115" />
 					</el-table>
 				</el-tab-pane>
@@ -159,16 +165,21 @@
 					<el-table-column  align="left" label="客户编号" prop="客户编号" width="80" />
 					<el-table-column  align="left" label="生产款号" prop="生产款号" width="115" />
 					<el-table-column  align="left" label="款式" prop="款式" width="115" />
+					<el-table-column  align="left" label="颜色" prop="颜色" width="115" />
 					<el-table-column  align="left" label="物料名称" prop="物料名称" width="115" />
-					<!-- <el-table-column  align="left" label="计划用料" prop="计划用料" width="90" /> -->
-					<!-- <el-table-column  align="left" label="计划门幅" prop="计划门幅" width="90" /> -->
+					<el-table-column  align="left" label="计划用料" prop="计划用料" width="90" />
+					<el-table-column  align="left" label="计划门幅" prop="计划门幅" width="90" />
 					<el-table-column  align="left" label="定额用料" prop="定额用料" width="90" />
 					<el-table-column  align="left" label="定额门幅" prop="定额门幅" width="90" />
-					<el-table-column  align="left" label="退还数量" prop="入库数量" width="90" />
-					<el-table-column  align="left" label="入库总量" prop="入库总量" width="90" />
-					<el-table-column  align="left" label="库存数量" prop="库存数量" width="90" />
+					<el-table-column  align="left" label="实裁数量" prop="实裁数量" width="90" />
+					<el-table-column  align="left" label="退还数量" prop="退还数量" width="90" />
+					<el-table-column  align="left" label="入仓总量" prop="入仓总量" width="90" />
+					<el-table-column  align="left" label="面料结余" prop="面料结余" width="90" />
 					<el-table-column  align="left" label="退还类型" prop="退还类型" width="90" />
 					<el-table-column  align="left" label="投料单位" prop="投料单位" width="90" />
+					<el-table-column  align="left" label="操作人员" prop="操作人员" width="90" />
+					<el-table-column  align="left" label="操作时间" prop="操作时间" width="160" />
+					<el-table-column  align="left" label="部门选择" prop="来料部门" width="90" />
 					<el-table-column  align="left" label="备注" prop="备注" width="160" />
 					</el-table>
 				</el-tab-pane>

src/view/inventory/ruku.vue

@@ -5,10 +5,8 @@
 			  <el-input v-model="records_searchInfo" placeholder="可搜索入库单号、订单编号、款号、款式、物料名称"  @input="records_handleInput"
 				@keyup.enter="search_onSubmit" id="searchInput"  style="width: 460px;height: 50px;margin-left: 10px;">
 			  </el-input>
-			  <el-button type="primary" @click="search_onSubmit" style="height: 50px;font-size: 20px;marg
-			  in-left: 20px;">查询</el-button>
-			  <el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;marg
-			  in-left: 20px;">面料入库</el-button>
+			  <el-button type="primary" @click="search_onSubmit" style="height: 50px;font-size: 20px;margin-left: 20px;">查询</el-button>
+			  <el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;margin-left: 20px;">面料入库</el-button>
 		</el-row>
       <layout>
 		<layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
@@ -72,6 +70,16 @@
   <el-dialog v-model="recorddialogFormVisible" :before-close="record_bomcloseDialog"  width="100%" style="height: 100%;margin: 0%;padding: 0px 10px 0px 10px;"  destroy-on-close>
 	  <el-button type="danger" @click="record_closeDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button> 
 	  <el-button type="primary" @click="edit_closeDialog"  style="width: 100px;height: 50px;margin-left: 10px;">更 新</el-button>
+		<!-- <el-form-item label="选择年月" label-width="100px"> -->
+			选择年月: <el-date-picker
+				v-model="rkrq"
+				type="date"
+				placeholder="选择年月"
+				:default-value="new Date()"
+				@change="onchange_data"
+				style="width: 200px;" 
+			/>
+		<!-- </el-form-item> -->
 	  <div class="gva-table-box">
 		<el-tabs v-model="activeName" @tab-click="handleClick">
 		  <el-tab-pane label="入库明细"  name="first">
@@ -109,7 +117,17 @@
 				  <el-table-column align="left"  label="库存总量" prop="库存数量"  width="90"/>
 				  <el-table-column align="left"  label="投料单位" prop="单位"  width="90"/>
 				  <el-table-column align="left"  label="部门" prop="departname"  width="110"/>
-				  <el-table-column align="left"  label="备注" prop="remark"  width="300"/>
+				  <el-table-column label="备注" prop="remark" width="300" align="left">
+				    <template #default="scope">
+				      <el-input class="green-bg-item"
+				        v-model="scope.row.remark"
+				        size="mini"
+				        :min="0"
+				        @input="handleInputChange(scope.row)"
+				        style="width: 280px;"
+				      />
+				    </template>
+				  </el-table-column>
 				  <el-table-column align="left"  label="入库人员" prop="操作机台"  width="100"/>
 				  <el-table-column align="left"  label="入库日期" prop="日期"  width="100"/>
 				  <el-table-column align="left"  label="创建日期" prop="创建日期"  width="160"/>
@@ -319,6 +337,7 @@ inputStash,rApictedit,
 InputOrderSearch,outReport,FabricDetail,gitReceiptNumber,FabricDetaillist,
 FabricDetaildel,ReceiptList,ReceiptDetail,fetchMonthlyFabricRecords} from '@/api/mes/job'
 import { ElMessage, ElMessageBox,ElUpload, ElButton } from 'element-plus';
+import dayjs, { Dayjs } from 'dayjs';
 import { useUserStore } from '@/pinia/modules/user'
 // import { get } from 'scriptjs';
 defineOptions({name: 'Company'})
@@ -910,6 +929,7 @@ const _danhao = ref('')
 //查看明细
 const record_deleteRow = async (row) => {
 	console.log(row)
+	rkrq.value = row.日期
 	recorddialogFormVisible.value = true
 	rdetailstableData.splice(0,rdetailstableData.length);
 	_danhao.value = row['出库单']
@@ -923,11 +943,20 @@ const record_closeDialog = async (row) => {
 	console.log(row)
 	recorddialogFormVisible.value = false
 }
+const rkrq = ref('')
+//选择日期
+const onchange_data = (val) => {
+  if (val) {
+    rkrq.value = dayjs(val).format('YYYY-MM-DD')
+  } else {
+    rkrq.value = ''
+  }
+}
 
 //更新
 const edit_closeDialog = async (row) => {
 	console.log(_danhao.value)
-	// console.log(rdetailstableData)
+	console.log(rdetailstableData)
 	//将修改的数据放入数组给到接口
 	const formattedData = rdetailstableData
 	.map(item => {
@@ -935,10 +964,14 @@ const edit_closeDialog = async (row) => {
 		id: item.id !== null ? item.id : "",
 		name: "入库",
 		sys_id:userStore.userInfo.nickName,
-		数量: item.数量 !== null ? item.数量 : ""
+		数量: item.数量 !== null ? item.数量 : "",
+		退还类型:'',
+		remark: item.remark !== null ? item.remark : "",
+        rq: rkrq.value,
 	  }
 	});
 	console.log(formattedData)
+
 	const rApictedit_data = await rApictedit(formattedData);
 	if (rApictedit_data.code === 0) {
 	  ElMessage({ type: 'success', message: '更新成功' });
@@ -946,6 +979,7 @@ const edit_closeDialog = async (row) => {
 	  rdetailstableData.splice(0,rdetailstableData.length);
 	  const FabricDetaillists = await ReceiptDetail({receipt:_danhao.value});
 	  rdetailstableData.splice(0,FabricDetaillists.length,...FabricDetaillists.data);
+	  records_onSubmit();
 	} else {
 	  ElMessage({ type: 'error', message: '更新失败' });
 	}

src/view/inventory/tuihuan.vue

@@ -5,6 +5,7 @@
                 <el-input v-model="records_searchInfo" placeholder="可搜索入库单号、订单编号、款号、款式、物料名称"  @input="records_handleInput"
                   @keyup.enter="search_onSubmit" id="searchInput"  style="width: 460px;height: 50px;margin-left: 10px;">
                 </el-input>
+                <el-button type="primary" @click="search_onSubmit" style="height: 50px;font-size: 20px;margin-left: 20px;">查询</el-button>
                 <el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;margin-left: 20px;">面料退还</el-button>
                 <!-- <el-button type="danger"  @click="deldetail_delclick" style="width: 80px;height: 50px;"	v-if="del_details=== true" :disabled="details_Selection === '' "  class="bt"   >删除</el-button> -->
           </el-row>
@@ -73,6 +74,14 @@
     <el-dialog v-model="recorddialogFormVisible" :before-close="record_bomcloseDialog"  width="100%" style="height: 100%;margin: 0%;padding: 0px 10px 0px 10px;"  destroy-on-close>
         <el-button type="danger" @click="record_closeDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
         <el-button type="primary" @click="edit_closeDialog"  style="width: 100px;height: 50px;margin-left: 10px;">更 新</el-button>
+        选择年月: <el-date-picker
+				v-model="thrq"
+				type="date"
+				placeholder="选择年月"
+				:default-value="new Date()"
+				@change="onchange_data"
+				style="width: 200px;" 
+			/>
 		<div class="gva-table-box">
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="退还明细"  name="first">
@@ -337,8 +346,9 @@
   import {ref, reactive} from 'vue'
   import {getInputDetail,
   TuihuoReport,
-  OutOrderSearch,outReport,FabricDetail,gitReceiptNumber,FabricDetaillist,FabricDetaildel,ReceiptList,ReceiptDetail,fetchMonthlyFabricRecords} from '@/api/mes/job'
+  OutOrderSearch,outReport,FabricDetail,rApictedit,gitReceiptNumber,FabricDetaillist,FabricDetaildel,ReceiptList,ReceiptDetail,fetchMonthlyFabricRecords} from '@/api/mes/job'
   import { ElMessage, ElMessageBox,ElUpload, ElButton } from 'element-plus';
+  import dayjs, { Dayjs } from 'dayjs';
   import { useUserStore } from '@/pinia/modules/user'
   // import { get } from 'scriptjs';
   defineOptions({name: 'Company'})
@@ -949,6 +959,7 @@ const _danhao = ref('')
 //查看明细
 const record_deleteRow = async (row) => {
   console.log(row)
+  thrq.value = row.日期
   recorddialogFormVisible.value = true
   rdetailstableData.splice(0,rdetailstableData.length);
   _danhao.value = row['出库单']
@@ -963,10 +974,20 @@ const record_closeDialog = async (row) => {
   recorddialogFormVisible.value = false
 }
   
+const thrq = ref('')
+//选择日期
+const onchange_data = (val) => {
+  if (val) {
+    thrq.value = dayjs(val).format('YYYY-MM-DD')
+  } else {
+    thrq.value = ''
+  }
+}
+
 //更新
 const edit_closeDialog = async (row) => {
 	console.log(_danhao.value)
-	// console.log(rdetailstableData)
+	console.log(rdetailstableData)
 	//将修改的数据放入数组给到接口
 	const formattedData = rdetailstableData
 	.map(item => {
@@ -974,8 +995,10 @@ const edit_closeDialog = async (row) => {
 		id: item.id !== null ? item.id : "",
 		name: "退还",
 		sys_id:userStore.userInfo.nickName,
-		退还类型: item.退还类型 !== null ? item.退还类型 : "",
-		数量: item.数量 !== null ? item.数量 : ""
+		数量: item.数量 !== null ? item.数量 : "",
+		退还类型:'退面料',
+		remark: item.remark !== null ? item.remark : "",
+    rq: thrq.value,
 	  }
 	});
 	console.log(formattedData)
@@ -986,6 +1009,7 @@ const edit_closeDialog = async (row) => {
 	  rdetailstableData.splice(0,rdetailstableData.length);
 	  const FabricDetaillists = await ReceiptDetail({receipt:_danhao.value});
 	  rdetailstableData.splice(0,FabricDetaillists.length,...FabricDetaillists.data);
+    records_onSubmit();
 	} else {
 	  ElMessage({ type: 'error', message: '更新失败' });
 	}

src/view/performance/chukubaogong.vue

@@ -5,6 +5,7 @@
 				<el-input v-model="records_searchInfo" placeholder="可搜索入库单号、订单编号、款号、款式、物料名称"  @input="records_handleInput"
 				  @keyup.enter="search_onSubmit" id="searchInput"  style="width: 460px;height: 50px;margin-left: 10px;">
 				</el-input>
+				<el-button type="primary" @click="search_onSubmit" style="height: 50px;font-size: 20px;margin-left: 20px;">查询</el-button>
 				<el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;margin-left: 20px;">面料出库</el-button>
 		  </el-row>
 		<layout>
@@ -72,6 +73,14 @@
 	<el-dialog v-model="recorddialogFormVisible" :before-close="record_bomcloseDialog"  width="100%" style="height: 100%;margin: 0%;padding: 0px 10px 0px 10px;"  destroy-on-close>
 		<el-button type="danger" @click="record_closeDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
 		<el-button type="primary" @click="edit_closeDialog"  style="width: 100px;height: 50px;margin-left: 10px;">更 新</el-button>
+		选择年月: <el-date-picker
+				v-model="ckrq"
+				type="date"
+				placeholder="选择年月"
+				:default-value="new Date()"
+				@change="onchange_data"
+				style="width: 200px;" 
+			/>
 		<div class="gva-table-box">
 		  <el-tabs v-model="activeName" @tab-click="handleClick">
 			<el-tab-pane label="出库明细"  name="first">
@@ -319,6 +328,7 @@
   OutOrderSearch,outReport,FabricDetail,gitReceiptNumber,
   FabricDetaillist,FabricDetaildel,ReceiptList,ReceiptDetail,fetchMonthlyFabricRecords} from '@/api/mes/job'
   import { ElMessage, ElMessageBox,ElUpload, ElButton } from 'element-plus';
+  import dayjs, { Dayjs } from 'dayjs';
   import { useUserStore } from '@/pinia/modules/user'
   // import { get } from 'scriptjs';
   defineOptions({name: 'Company'})
@@ -893,6 +903,7 @@ const _danhao = ref('')
 //查看明细
 const record_deleteRow = async (row) => {
   console.log(row)
+  ckrq.value = row.日期
   recorddialogFormVisible.value = true
   rdetailstableData.splice(0,rdetailstableData.length);
   _danhao.value = row['出库单']
@@ -907,10 +918,20 @@ const record_closeDialog = async (row) => {
   recorddialogFormVisible.value = false
 }
   
+const ckrq = ref('')
+//选择日期
+const onchange_data = (val) => {
+  if (val) {
+    ckrq.value = dayjs(val).format('YYYY-MM-DD')
+  } else {
+    ckrq.value = ''
+  }
+}
+
 //更新
 const edit_closeDialog = async (row) => {
 	console.log(_danhao.value)
-	// console.log(rdetailstableData)
+	console.log(rdetailstableData)
 	//将修改的数据放入数组给到接口
 	const formattedData = rdetailstableData
 	.map(item => {
@@ -918,7 +939,10 @@ const edit_closeDialog = async (row) => {
 		id: item.id !== null ? item.id : "",
 		name: "出库",
 		sys_id:userStore.userInfo.nickName,
-		数量: item.数量 !== null ? item.数量 : ""
+		数量: item.数量 !== null ? item.数量 : "",
+		退还类型:'',
+		remark: item.remark !== null ? item.remark : "",
+        rq: ckrq.value,
 	  }
 	});
 	console.log(formattedData)
@@ -929,6 +953,7 @@ const edit_closeDialog = async (row) => {
 	  rdetailstableData.splice(0,rdetailstableData.length);
 	  const FabricDetaillists = await ReceiptDetail({receipt:_danhao.value});
 	  rdetailstableData.splice(0,FabricDetaillists.length,...FabricDetaillists.data);
+	  records_onSubmit();
 	} else {
 	  ElMessage({ type: 'error', message: '更新失败' });
 	}