first commit

src/view/inventory/ruku.vue

@@ -101,8 +101,11 @@
 			  <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="departname"  width="110"/>
+			  <el-table-column align="left"  label="备注" prop="remark"  width="110"/>
 			  <el-table-column align="left"  label="入库人员" prop="操作机台"  width="100"/>
 			  <el-table-column align="left"  label="入库日期" prop="日期"  width="160"/>
+			  
 			  </el-table>
 		  </el-tab-pane>
 		 </el-tabs>
@@ -197,6 +200,14 @@
 			</el-descriptions-item>
 		</el-descriptions>
 		
+		<el-descriptions class="margin-top" :column="3" :size="size" border>
+			<el-descriptions-item label="备注">
+			  <el-input v-model="mianliaotabData.备注" placeholder="" class="green-bg-item" style="margin: 0;"/>
+			</el-descriptions-item>
+		</el-descriptions>
+		
+	
+		
 		<!-- <el-button type="primary" @click="dj_Dialog" style="width: 120px; height: 50px; position: absolute; bottom: 0px; right: 10px;">
 		  添加面料
 		</el-button> -->
@@ -226,12 +237,12 @@
 				<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="110"/>
+				<el-table-column  align="left" label="客户" prop="客户编号" width="90"/>
 				<el-table-column  align="left" label="生产款号" prop="生产款号" width="110"/>
+				<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="130" />
-				<el-table-column  align="left" label="客户" prop="客户编号" width="90"/>
 				<el-table-column  align="left" label="款式" prop="款式" width="120"/>
-				<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" />	 
@@ -243,6 +254,7 @@
 				<!-- <el-table-column  align="left" label="领用数量" prop="领用数量" width="90"/> -->
 				<el-table-column  align="left" label="单位" prop="单位" width="60"/>
 				<el-table-column  align="left" label="部门" prop="部门" width="60"/> 
+				<el-table-column  align="left" label="备注" prop="备注" width="210"/>
 				<!-- <el-table-column  align="left" label="关联订单" prop="关联订单" width="300"/> -->
 				<el-table-column fixed="right" label="操作" width="120">
 				    <template #default="{ row, $index }">
@@ -525,6 +537,7 @@ const mianliaotabData = ref({
     颜色: '',
     单位: '',
 	部门: '',
+	备注:'',
 });
 //表格行点击
 const tableRowClick = async (row) => {
@@ -803,6 +816,7 @@ const res_bomenterDialog = async () => {
     批次号: item['批次号'],
     关联编号: item['关联号'],
 	departname: item['部门'],
+	remark: item['备注'],
     实际门幅: item['实际门幅'],
 	单位: item['单位'],
   }));

src/view/inventory/tuihuan.vue

@@ -101,6 +101,8 @@
 			  <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="departname"  width="90"/>
+			  <el-table-column align="left"  label="备注" prop="remark"  width="90"/>
 			  <el-table-column align="left"  label="退还人员" prop="操作机台"  width="100"/>
 			  <el-table-column align="left"  label="退还日期" prop="日期"  width="160"/>
                 </el-table>
@@ -186,14 +188,15 @@
                 <el-input v-model="mianliaotabData.退还数量" id='rksl' placeholder="" class="green-bg-item" style="margin: 0; width: 100px;"/>
               </el-descriptions-item>
           </el-descriptions>
-          <el-descriptions class="margin-top" :column="2" :size="size" border>
-            <el-descriptions-item label="退还类型">
-                <el-radio v-model="radio1" label="退面料" border>退面料</el-radio>
-                <el-radio v-model="radio1" label="退厂商" border>退厂商</el-radio>
-                <el-radio v-model="radio1" label="退次品" border>退次品</el-radio>
-              </el-descriptions-item>
-          </el-descriptions>
-          <el-descriptions class="margin-top" :column="2" :size="size" border>
+          <!-- <el-descriptions class="margin-top" :column="2" :size="size" border>
+            
+          </el-descriptions> -->
+          <el-descriptions class="margin-top" :column="1" :size="size" border>
+			  <el-descriptions-item label="退还类型">
+			      <el-radio v-model="radio1" label="退面料" border>退面料</el-radio>
+			      <el-radio v-model="radio1" label="退厂商" border>退厂商</el-radio>
+			      <el-radio v-model="radio1" label="退次品" border>退次品</el-radio>
+			    </el-descriptions-item>
 			<el-descriptions-item label="选择部门" >
 				<el-radio-group v-model="mianliaotabData.部门" >
 					<el-radio label="业务部" border >业务部</el-radio>
@@ -204,6 +207,11 @@
 				</el-radio-group>
 			</el-descriptions-item>
 		</el-descriptions>
+		<el-descriptions class="margin-top" :column="3" :size="size" border>
+			<el-descriptions-item label="备注">
+			  <el-input v-model="mianliaotabData.备注" placeholder="" class="green-bg-item" style="margin: 0;"/>
+			</el-descriptions-item>
+		</el-descriptions>
           <!-- <el-button type="primary" @click="dj_Dialog" style="width: 120px; height: 50px; position: absolute; bottom: 0px; right: 10px;">
             添加面料
           </el-button> -->
@@ -251,6 +259,7 @@
                   <!-- <el-table-column  align="left" label="领用数量" prop="领用数量" width="90"/> -->
                   <el-table-column  align="left" label="单位" prop="单位" width="60"/>
                   <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="300"/> -->
                   <el-table-column fixed="right" label="操作" width="120">
                       <template #default="{ row, $index }">
@@ -541,6 +550,7 @@ const search_onSubmit = async ()  => {
       颜色: '',
       单位: '',
       部门: '',
+	  备注: '',
       实际门幅: '',
   });
   
@@ -599,6 +609,7 @@ const search_onSubmit = async ()  => {
       颜色: Detailres.data.BOM_颜色,
       单位: Detailres.data.单位,
       部门: Detailres.data.departname,
+	  备注: Detailres.data.remark,
       实际门幅: Detailres.data.实际门幅,
     };
 
@@ -834,6 +845,7 @@ const dj_Dialog = () => {
       关联编号: item['关联号'],
       单位: item['单位'],
       departname: item['部门'],
+	  remark: item['备注'],
       实际门幅: item['实际门幅'],
       type: item['退还类型'],
     }));

src/view/performance/chukubaogong.vue

@@ -100,6 +100,8 @@
 				<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="departname"  width="90"/>
+				<el-table-column align="left"  label="备注" prop="remark"  width="90"/>
 				<el-table-column align="left"  label="出库人员" prop="操作机台"  width="100"/>
 				<el-table-column align="left"  label="出库日期" prop="日期"  width="160"/>
 				</el-table>
@@ -196,6 +198,11 @@
 				</el-radio-group>
 			</el-descriptions-item>
 		</el-descriptions>
+		<el-descriptions class="margin-top" :column="3" :size="size" border>
+			<el-descriptions-item label="备注">
+			  <el-input v-model="mianliaotabData.备注" placeholder="" class="green-bg-item" style="margin: 0;"/>
+			</el-descriptions-item>
+		</el-descriptions>
 		  
 		  <!-- <el-button type="primary" @click="dj_Dialog" style="width: 120px; height: 50px; position: absolute; bottom: 0px; right: 10px;">
 			添加面料
@@ -243,6 +250,7 @@
 				  <!-- <el-table-column  align="left" label="领用数量" prop="领用数量" width="90"/> -->
 				  <el-table-column  align="left" label="单位" prop="单位" width="60"/>
 				  <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="300"/> -->
 				  <el-table-column fixed="right" label="操作" width="120">
 					  <template #default="{ row, $index }">
@@ -530,6 +538,7 @@ const search_onSubmit = async ()  => {
 	  颜色: '',
 	  单位: '',
 	  部门: '',
+	  备注:'',
 	  实际门幅: '',
   });
   //表格行点击
@@ -591,6 +600,7 @@ const search_onSubmit = async ()  => {
       颜色: Detailres.data.BOM_颜色,
       单位: Detailres.data.单位,
 	  部门: Detailres.data.departname,
+	  备注: Detailres.data.remark,
       实际门幅: Detailres.data.实际门幅,
     };
 
@@ -803,6 +813,7 @@ const search_onSubmit = async ()  => {
 	  关联编号: item['关联号'],
 	  单位: item['单位'],
 	  departname: item['部门'],
+	  remark: item['备注'],
 	  // 实际门幅: item['实际门幅'],
 	}));
 	console.log(formattedDataArray);