liuhairui hace 8 meses
padre
commit
74aa36eae4

+ 10 - 5
src/view/performance/QualityAssessment/SemiFinishedRework.vue

@@ -49,7 +49,8 @@
             </div>
             <!-- 弹出框 -->
             <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type === 'create' ? '服装半成品返工报工页面' : '服装半成品返工报工修改'"
-              destroy-on-close width="1000px">
+              destroy-on-close style="width: 90%; height: 90%; margin-top: 3%;">
+              
               <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="70px" >
                 <el-row :gutter="24">
                   <el-col :span="6">
@@ -59,13 +60,17 @@
                   </el-col>
                 </el-row>
                 <el-row :gutter="24">
-                    <div style="width: 900px; margin-left: 20px;">
+                    <div style="width: 100%; margin-left: 20px;">
                         <div style="margin-bottom: 5px;">
-                            <span style="display: inline-block; text-align: center; width: 220px; margin-right: 5px;" >工单号|款号</span>
-                            <span style="display: inline-block; text-align: center; width: 110px; margin-left: 45px; margin-right: 5px;" >返工工序</span>
+                            <span style="display: inline-block; text-align: center; width: 220px; margin-right: 5px;" >订单编号|款号</span>
+							<span style="display: inline-block; text-align: center; width: 110px; margin-left: 45px; margin-right: 5px;" >款式</span>
+							<span style="display: inline-block; text-align: center; width: 110px; margin-left: 45px; margin-right: 5px;" >颜色</span>
+							<span style="display: inline-block; text-align: center; width: 110px; margin-left: 45px; margin-right: 5px;" >尺码</span>
+                            <!-- <span style="display: inline-block; text-align: center; width: 110px; margin-left: 45px; margin-right: 5px;" >返工工序</span> -->
                             <span style="display: inline-block; text-align: center; width: 95px;  margin-left: 10px; margin-right: 5px;" >返工数量</span>
-                            <span style="display: inline-block; text-align: center; width: 130px; margin-left: -30  px;" >生产车缝小组</span>
                             <span style="display: inline-block; text-align: center; width: 130px; margin-right: 5px;" >返工车缝小组</span>
+							<span style="display: inline-block; text-align: center; width: 130px; margin-right: 5px;" >返工问题</span>
+							<span style="display: inline-block; text-align: center; width: 130px; margin-right: 5px;" >备注</span>
                         </div>
                       <div v-for="index in 6" :key="index">
                         <el-input style="width: 220px; margin-left: 75px; margin-right: 5px;margin-bottom: 5px;" placeholder="Enter回车" v-model="formData['sczl_gdbh' + index]" :id="'sczl_gdbh' + index" @keydown="ent1($event, index.toString())" @blur="getGxMcsubmit($event, index.toString())" />

+ 12 - 6
src/view/performance/QualityAssessment/cropdefective.vue

@@ -70,10 +70,13 @@
 		        <el-col :span="19" style="margin-bottom: 15px;">
 		          <!-- 表格头部 -->
 		        <div style="display: flex; justify-content: space-between; margin-bottom: 10px;">
-		          <span style="flex: 1;">订单编号</span>
+		          <span style="flex: 1;">订单编号|款号</span>
+		          <span style="flex: 1;">面料分类|面料名称</span>
+				  <span style="flex: 1;">颜色</span>
 		          <span style="flex: 1;">款号|款式</span>
-		          <span style="flex: 1;">颜色</span>
 		          <span style="flex: 1;">次片数量</span>
+				  <span style="flex: 1;">次片问题</span>
+				  <span style="flex: 1;">备注</span>
 		          <span style="flex: 1;">报工小组</span>
 		        </div>
 		        </el-col>
@@ -82,10 +85,13 @@
 		        <el-col v-for="(row, index) in rows" :key="index" :span="19" style="margin-bottom: 10px; overflow-x: auto;">
 		          <div style="display: flex; justify-content: space-between; align-items: center;">
 		            <el-input style="width: 220px;" placeholder="Enter回车" v-model="row.gdbh" @blur="getGxMcsubmit($event, index)" />
-		            <el-input style="width: 140px;" :readonly="true" v-model="row.khks" />
-					<el-input style="width: 140px;" :readonly="true" v-model="row.color" />
-					<el-input style="width: 140px;" :readonly="true" v-model="row.cpsl" />
-		            <el-input style="width: 140px;" :readonly="true" v-model="row.bgxz" />
+		            <el-input style="width: 140px;" v-model="row.khks" />
+					<el-input style="width: 140px;"  v-model="row.color" />
+					<el-input style="width: 140px;"  v-model="row.cpsl" />
+					<el-input style="width: 140px;"  v-model="row.color" />
+					<el-input style="width: 140px;" v-model="row.color" />
+		            <el-input style="width: 140px;" v-model="row.bgxz" />
+					<el-button type="primary" @click="removeRow(index)" style="font-size: 18px;">复制本条</el-button>
 		            <el-button type="danger" @click="removeRow(index)" style="font-size: 18px;">移除</el-button>
 		          </div>
 		        </el-col>