liuhairui 8 сар өмнө
parent
commit
9d5f4fc122

+ 8 - 17
src/view/inventory/ruku.vue

@@ -35,7 +35,7 @@
 				  <el-table-column align="left"  label="入库日期" prop="日期"  width="100"/>
 				  <el-table-column align="left"  label="创建日期" prop="创建日期"  width="160"/>
 				  <el-table-column align="left"  label="类型" prop="单号类型"  width="90"/>
-				  <el-table-column fixed="right" label="操作" width="130">
+				  <el-table-column fixed="right" label="操作" width="120">
 				    <template #default="{ row, $index }">
 				      <el-button @click="record_deleteRow(row,$index)" type="success" size="small" 
 					  style="font-size: 16px;padding: 0px;width: 90px;">
@@ -67,7 +67,8 @@
   
   <!-- 明细数据 -->
   <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="primary" @click="record_closeDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
+	  <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> -->
 	  <div class="gva-table-box">
 		<el-tabs v-model="activeName" @tab-click="handleClick">
 		  <el-tab-pane label="入库明细"  name="first">
@@ -80,16 +81,10 @@
 						:summary-method="getSummaries" tooltip-effect="dark" :data="rdetailstableData" row-key="ID" >
 				  <!-- <el-table-column   align="center" type="selection" width="40"/> -->
 				  <el-table-column align="left"  label="入库单号" prop="出库单据编号"  width="140"/>
-				  <!-- <el-table-column align="left"  label="批次号" prop="批次号"  width="90"/> -->
 				  <el-table-column align="left"  label="订单编号" prop="订单编号"  width="105"/>
-				  <!-- <el-table-column align="left"  label="客户" prop="客户编号"  width="70"/> -->
 				  <el-table-column align="left"  label="生产款号" prop="款号"  width="140"/>
-				  <!-- <el-table-column align="left"  label="款式" prop="款式"  width="120"/> -->
-				  <!-- <el-table-column align="left"  label="物料编码" prop="物料编码"  width="150"/> -->
 				  <el-table-column align="left"  label="物料名称" prop="物料名称"  width="140"/>
 				  <el-table-column align="left"  label="颜色" prop="BOM_颜色"  width="100"/>
-				  <!-- <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"/>
@@ -114,7 +109,7 @@
   <!-- 选择入库弹窗 -->
   <el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" style="width: 100%;height: 100%;margin: 0px;padding: 0px;"  destroy-on-close>
 	<div class="dialog-footer" style="margin: 0px;">
-		<el-button type="primary" @click="res_bomcloseDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
+		<el-button type="danger" @click="res_bomcloseDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
 		<el-button type="primary" @click="dj_Dialog"  style="width: 120px; height: 50px;">添加面料</el-button>
 		<el-button type="primary"  @click="res_bomenterDialog"  style="width: 100px;height: 50px;">一键入库</el-button>
 	</div>
@@ -174,12 +169,11 @@
 			</el-descriptions-item>
 		</el-descriptions>
 		<el-descriptions class="margin-top" :column="2" :size="size" border>
-			<el-descriptions-item label="选择部门" >
+			<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 label="裁床" border >裁床</el-radio>
+					<el-radio label="外购" border >外购</el-radio>
+					<el-radio label="客供" border >客供</el-radio>
+					<el-radio label="委托加工" border >委托加工</el-radio>
 					<el-radio label="其他" border >其他</el-radio>
 				</el-radio-group>
 			</el-descriptions-item>
@@ -895,9 +889,6 @@ const record_closeDialog = async (row) => {
 
 
 
-
-
-
 const details_pickingaddvisible = ref(false)
 const ruku_detailstableData = reactive([])
 const rukuupdateCompanyFunc = async (row)=>{

+ 5 - 5
src/view/inventory/tuihuan.vue

@@ -32,9 +32,9 @@
                       <el-table-column align="left"  label="款号" prop="款号"  width="140"/>
                       <el-table-column align="left"  label="款式" prop="款式"  width="140"/>
                       <el-table-column align="left"  label="物料名称" prop="物料名称"  width="140"/>
-                      <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="100"/>
+                      <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="100"/>
                       <el-table-column align="left"  label="创建日期" prop="创建日期"  width="160"/>
                       <el-table-column align="left"  label="类型" prop="单号类型"  width="90"/>
                     <el-table-column fixed="right" label="操作" width="130">
@@ -71,7 +71,7 @@
     
     <!-- 明细数据 -->
     <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="primary" @click="record_closeDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
+        <el-button type="danger" @click="record_closeDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
         <div class="gva-table-box">
           <el-tabs v-model="activeName" @tab-click="handleClick">
             <el-tab-pane label="退还明细"  name="first">
@@ -117,7 +117,7 @@
     <!-- 选择退还弹窗 -->
     <el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" style="width: 100%;height: 100%;margin: 0px;padding: 0px;"  destroy-on-close>
       <div class="dialog-footer" style="margin: 0px;">
-          <el-button type="primary" @click="res_bomcloseDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
+          <el-button type="danger" @click="res_bomcloseDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
           <el-button type="primary" @click="dj_Dialog"  style="width: 120px; height: 50px;">
             添加面料
           </el-button>

+ 5 - 5
src/view/performance/chukubaogong.vue

@@ -70,7 +70,7 @@
 	
 	<!-- 明细数据 -->
 	<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="primary" @click="record_closeDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
+		<el-button type="danger" @click="record_closeDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
 		<div class="gva-table-box">
 		  <el-tabs v-model="activeName" @tab-click="handleClick">
 			<el-tab-pane label="出库明细"  name="first">
@@ -97,14 +97,14 @@
 				<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="departname"  width="110"/>
 				<el-table-column align="left"  label="备注" prop="remark"  width="300"/>
-				<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="100"/>
+				<el-table-column align="left"  label="库日期" prop="日期"  width="100"/>
 				<el-table-column align="left"  label="创建日期" prop="创建日期"  width="160"/>
 				</el-table>
 			</el-tab-pane>
@@ -117,7 +117,7 @@
 	<!-- 选择出库弹窗 -->
 	<el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" style="width: 100%;height: 100%;margin: 0px;padding: 0px;"  destroy-on-close>
 	  <div class="dialog-footer" style="margin: 0px;">
-		  <el-button type="primary" @click="res_bomcloseDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
+		  <el-button type="danger" @click="res_bomcloseDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
 		  <el-button type="primary" @click="dj_Dialog"  style="width: 120px; height: 50px;">添加面料</el-button>
 		  <el-button type="primary"  @click="res_bomenterDialog"  style="width: 100px;height: 50px;">一键出库</el-button>
 	  </div>