first commit

src/view/inventory/ruku.vue

@@ -149,7 +149,7 @@
 		</div>
 
 		<!-- 右部分 -->
-		<div style="position: relative;width: 1300px;height: 310px;">
+		<div style="position: relative;width: 1300px;height: 416px;">
 			<!-- <el-descriptions class="margin-top" :column="1" :size="size" border>
 				<el-descriptions-item label="关联订单">{{ mianliaotabData.关联订单 }}</el-descriptions-item>
 			</el-descriptions> -->
@@ -188,7 +188,7 @@
 			  <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="1" :size="size" border>
+		<el-descriptions class="margin-top" :column="2" :size="size" border>
 			<el-descriptions-item label="选择部门" >
 				<el-radio-group v-model="mianliaotabData.部门" >
 					<el-radio label="业务部" border >业务部</el-radio>

src/view/inventory/tuihuan.vue

@@ -143,39 +143,37 @@
                 <el-table-column  align="left" label="订单编号" prop="订单编号" width="110" />
                 <el-table-column  align="left" label="生产款号" prop="生产款号" width="110" />
                 <el-table-column  align="left" label="物料名称" prop="物料名称" width="120" />	 
-                <el-table-column  align="left" label="颜色" prop="颜色" width="100" />
+                <el-table-column  align="left" label="颜色" prop="颜色" width="80" />
               </el-table>
           </div>
   
           <!-- 右部分 -->
-          <div style="position: relative;width: 1300px;height: 310px;">
-              <!-- <el-descriptions class="margin-top" :column="1" :size="size" border>
-                  <el-descriptions-item label="关联订单">{{ mianliaotabData.关联订单 }}</el-descriptions-item>
-              </el-descriptions> -->
+          <div style="position: relative;width: 1300px;height: 416px;">
             <el-descriptions class="margin-top" :column="4" :size="size" border>
               <el-descriptions-item label="批次号">{{ mianliaotabData.批次号 }}</el-descriptions-item>
               <el-descriptions-item label="关联号">{{ mianliaotabData.关联号 }}</el-descriptions-item>
               <el-descriptions-item label="订单编号">{{ mianliaotabData.订单编号 }}</el-descriptions-item>
               <el-descriptions-item label="客户">{{ mianliaotabData.客户编号 }}</el-descriptions-item>
-              <!-- <el-descriptions-item label="款式">{{ ddhformData['ks'] }}</el-descriptions-item> -->
               <el-descriptions-item label="物料编号">{{ mianliaotabData.物料编号 }}</el-descriptions-item>
               <el-descriptions-item label="生产款号">{{ mianliaotabData.生产款号 }}</el-descriptions-item>
               <el-descriptions-item label="颜色">{{ mianliaotabData.颜色 }}</el-descriptions-item>
               <el-descriptions-item label="物料名称">{{ mianliaotabData.物料名称 }}</el-descriptions-item>
-              <!-- <el-descriptions-item label="计划用料">{{ mianliaotabData.计划用料 }}</el-descriptions-item> -->
-              <!-- <el-descriptions-item label="计划门幅">{{ mianliaotabData.计划门幅 }}</el-descriptions-item> -->
-              <!-- <el-descriptions-item label="单位">{{ mianliaotabData.单位 }}</el-descriptions-item> -->
-              <el-descriptions-item label="累计退还数量">{{ mianliaotabData.入仓总数量 }}</el-descriptions-item>
-              <el-descriptions-item label="库存数量">{{ mianliaotabData.库存数量 }}</el-descriptions-item>
-              <el-descriptions-item label="单位" >
-                <el-radio-group v-model="mianliaotabData.单位" >
-                  <el-radio label="米" border >米</el-radio>
-                  <el-radio label="码" border >码</el-radio>
-                  <el-radio label="公斤" border >公斤</el-radio>
-                </el-radio-group>
-              </el-descriptions-item>
-              <!-- <el-descriptions-item label="领用数量">{{ mianliaotabData.领用数量 }}</el-descriptions-item> -->
+             
             </el-descriptions>
+			
+			<el-descriptions class="margin-top" :column="4" :size="size" border>
+			  <!-- <el-descriptions-item label="计划用料">{{ mianliaotabData.计划用料 }}</el-descriptions-item> -->
+			  <!-- <el-descriptions-item label="计划门幅">{{ mianliaotabData.计划门幅 }}</el-descriptions-item> -->
+			  <el-descriptions-item label="累计退还数量">{{ mianliaotabData.入仓总数量 }}</el-descriptions-item>
+			  <el-descriptions-item label="库存数量">{{ mianliaotabData.库存数量 }}</el-descriptions-item>
+			  <el-descriptions-item label="单位" >
+			    <el-radio-group v-model="mianliaotabData.单位" >
+			      <el-radio label="米" border >米</el-radio>
+			      <el-radio label="码" border >码</el-radio>
+			      <el-radio label="公斤" border >公斤</el-radio>
+			    </el-radio-group>
+			  </el-descriptions-item>
+			</el-descriptions>
             
           <el-descriptions class="margin-top" :column="4" :size="size" border>
               <el-descriptions-item label="定额用料">{{ mianliaotabData.定额用料 }}</el-descriptions-item>
@@ -191,12 +189,14 @@
           <!-- <el-descriptions class="margin-top" :column="2" :size="size" border>
             
           </el-descriptions> -->
-          <el-descriptions class="margin-top" :column="1" :size="size" border>
+          <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-item label="选择部门" >
 				<el-radio-group v-model="mianliaotabData.部门" >
 					<el-radio label="业务部" border >业务部</el-radio>
@@ -217,6 +217,8 @@
           </el-button> -->
           </div>
       </div>
+	  <br>
+	  <br>
           <el-divider><span class="print-title" style="font-size: 18px;">面料退还单</span></el-divider>
           <el-descriptions class="margin-top" :column="3"  :size="size" border>
               <el-descriptions-item label="退还单号">{{danhao}}</el-descriptions-item>

src/view/performance/chukubaogong.vue

@@ -147,7 +147,7 @@
 		  </div>
   
 		  <!-- 右部分 -->
-		  <div style="position: relative;width: 1300px;height: 310px;">
+		  <div style="position: relative;width: 1300px;height: 416px;">
 			  <!-- <el-descriptions class="margin-top" :column="1" :size="size" border>
 				  <el-descriptions-item label="关联订单">{{ mianliaotabData.关联订单 }}</el-descriptions-item>
 			  </el-descriptions> -->
@@ -187,7 +187,7 @@
 				<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="1" :size="size" border>
+		  <el-descriptions class="margin-top" :column="2" :size="size" border>
 			<el-descriptions-item label="选择部门" >
 				<el-radio-group v-model="mianliaotabData.部门" >
 					<el-radio label="业务部" border >业务部</el-radio>