liuhairui 1 年之前
父节点
当前提交
90fdd01abc

+ 2 - 2
src/view/yunyin/shengchanguanli/baogongshuju.vue

@@ -139,8 +139,8 @@
                               size="small" highlight-current-row="true" @row-dblclick="add_updateCompanyFunc"
                               @row-click="add_tableRowClick" :show-overflow-tooltip="true"
                               @selection-change="handleSelectionChange">
-                        <el-table-column sortable align="left" label="订单编号" prop="订单编号" width="110"/>
-                        <el-table-column sortable align="left" label="子订单编号" prop="子订单编号" width="115"/>
+                        <el-table-column sortable align="left" label="订单编号" prop="订单编号" width="105"/>
+                        <el-table-column sortable align="left" label="子订单编号" prop="子订单编号" width="110"/>
                         <el-table-column sortable align="left" label="款号" prop="款号" width="110"/>
 						<el-table-column sortable align="left" label="颜色" prop="颜色" width="110"/>
 						<el-table-column sortable align="left" label="船样" prop="船样" width="110"/>

文件差异内容过多而无法显示
+ 0 - 0
src/view/yunyin/shengchanguanli/components/print.vue


+ 281 - 105
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -54,16 +54,18 @@
                 <el-table-column align="left" sortable label="生产款号"   	prop="生产款号"  width="110" />
                 <el-table-column align="left" sortable label="款式"       	prop="款式"   	width="100"/>
 				<el-table-column align="left" sortable label="订单数量"    	prop="订单数量" 	width="105" />
-				<el-table-column align="left" sortable label="单位"    		prop="单位" 		width="80" />
+				<el-table-column align="left" sortable label="制单日期"    	prop="Sys_rq" 	width="160" />
 				<el-table-column align="left" sortable label="落货日期"   	prop="落货日期" 	width="120" />
 				<el-table-column align="left" sortable label="船样合计"    	prop="船样合计" 	width="105" />
 				<el-table-column align="left" sortable label="船样描述"    	prop="船样描述" 	width="140" />
+				<el-table-column align="left" sortable label="单位"    		prop="单位" 		width="80" />
                 <el-table-column align="left" sortable label="面料"       	prop="面料" 		width="130" />
                 <el-table-column align="left" sortable label="要求"       	prop="要求" 		width="130" />
                 <el-table-column align="left" sortable label="粘衬"        	prop="粘衬"		width="80" />
 				<el-table-column align="left" sortable label="箱唛要求"   	prop="箱唛要求" 	width="110" />
                 <el-table-column align="left" sortable label="审核"    		prop="审核" 		width="80" />
                 <el-table-column align="left" sortable label="审核日期"    	prop="审核日期" 	width="110" />
+				<el-table-column align="left" sortable label="制单人"    	prop="Sys_id" 	width="160" />
               </el-table>
               <!-- 分页 -->
               <div class="gva-pagination">
@@ -91,17 +93,18 @@
                           @selection-change="selectionChange($event, '颜色资料')"
                           style="width: 100%;height: 36vh" border show-summary
                           :summary-method="getSummaries" tooltip-effect="dark" :data="ystableData" row-key="ID" >
-                  <el-table-column type="selection" width="55" />
+                  <el-table-column type="selection" width="30" />
                   <!-- <el-table-column align="left" sortable label="序号" prop="序号"  width="100"/> -->
-                  <el-table-column align="left" sortable label="订单子编号" prop="子订单编号"  width="180"/>
-                  <el-table-column align="left" sortable label="色系名称" prop="颜色"  width="110"/>
+                  <el-table-column align="left" sortable label="订单子编号" prop="子订单编号"  width="130"/>
+				  <el-table-column align="left" sortable label="款号	" prop="款号"  width="180"/>
+                  <el-table-column align="left" sortable label="色系名称" prop="颜色"  width="105"/>
                   <el-table-column align="left" sortable label="船样" prop="船样"  width="80"/>
                   <template v-for="item in sizeDatas">
                     <el-table-column align="left" sortable :label=item :prop=item  width="80"/> 
                   </template>
                   <el-table-column align="left" sortable label="制单总数" prop="zdtotal"  width="110"/>
-                  <el-table-column align="left" sortable label="建档用户" prop="Sys_id"  width="110"/>
-                  <el-table-column align="left" sortable label="建档时间" prop="Sys_rq"  width="110"/>
+                  <el-table-column align="left" sortable label="建档用户" prop="Sys_id"  width="160"/>
+                  <el-table-column align="left" sortable label="建档时间" prop="Sys_rq"  width="160"/>
                   <el-table-column align="left" sortable label="更新时间" prop="更新时间"  width="110"/>
                 </el-table>
               </el-tab-pane>
@@ -145,9 +148,9 @@
                   <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="105"/>
-                  <el-table-column align="left" label="建档用户" prop="sys_id"  width="90"/>
-                  <el-table-column align="left" label="建档时间" prop="sys_rq"  width="115"/>
-                  <el-table-column align="left" label="更新时间" prop="mod_rq"  width="115"/>
+                  <el-table-column align="left" label="建档用户" prop="sys_id"  width="160"/>
+                  <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
+                  <el-table-column align="left" label="更新时间" prop="mod_rq"  width="160"/>
                   <!-- <el-table-column align="left" label="操作" prop="操作"  width="70" /> -->
                 </el-table>
               </el-tab-pane> 
@@ -167,9 +170,9 @@
                   <el-table-column align="left" label="备注" prop="附件备注"  width="85"/>
                   <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="sys_id"  width="90"/>
-                  <el-table-column align="left" label="建档时间" prop="sys_rq"  width="115"/>
-                  <el-table-column align="left" label="更新时间" prop="mod_rq"  width="115"/>
+                  <el-table-column align="left" label="建档用户" prop="sys_id"  width="160"/>
+                  <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
+                  <el-table-column align="left" label="更新时间" prop="mod_rq"  width="160"/>
 			      </el-table>
 			    </el-tab-pane>
             </el-tabs>
@@ -310,26 +313,31 @@
              </el-row>
          
              <el-row :gutter="24">
-                 <el-col :span="10">
+            <!--     <el-col :span="10">
                      <div style="display: flex; gap: 0px;">
                          <el-form-item label="色系名称:" class="mab" prop="keyOrder" label-width='110'>
-                             <el-select v-model="edit_formData['颜色']" style="width: 150px;" id="尺码规格" @keydown="add_gdzlent($event, '款号', '尺码规格', '是否船样')">
-                                 <el-option label="红色系" @click="sxhandleSizeChange('红色系')"></el-option>
-                                 <el-option label="黄色系" @click="sxhandleSizeChange('黄色系')"></el-option>
-                                 <el-option label="蓝色系" @click="sxhandleSizeChange('蓝色系')"></el-option>
-                                 <el-option label="绿色系" @click="sxhandleSizeChange('绿色系')"></el-option>
-                                 <el-option label="紫色系" @click="sxhandleSizeChange('紫色系')"></el-option>
-                                 <el-option label="灰色系" @click="sxhandleSizeChange('灰色系')"></el-option>
-                                 <el-option label="咖啡色系" @click="sxhandleSizeChange('咖啡色系')"></el-option>
-                                 <el-option label="黑白色系" @click="sxhandleSizeChange('黑白色系')"></el-option>
-                                 <el-option label="经典色系" @click="sxhandleSizeChange('经典色系')"></el-option>
+                             <el-select v-model="edit_formData['颜色']" style="width: 150px;" id="颜色" @keydown="add_gdzlent($event, '款号', '尺码规格', '是否船样')">
+                                 <el-option label="红色系" @click="xg_sxhandleSizeChange('红色系')"></el-option>
+                                 <el-option label="黄色系" @click="xg_sxhandleSizeChange('黄色系')"></el-option>
+                                 <el-option label="蓝色系" @click="xg_sxhandleSizeChange('蓝色系')"></el-option>
+                                 <el-option label="绿色系" @click="xg_sxhandleSizeChange('绿色系')"></el-option>
+                                 <el-option label="紫色系" @click="xg_sxhandleSizeChange('紫色系')"></el-option>
+                                 <el-option label="灰色系" @click="xg_sxhandleSizeChange('灰色系')"></el-option>
+                                 <el-option label="咖啡色系" @click="xg_sxhandleSizeChange('咖啡色系')"></el-option>
+                                 <el-option label="黑白色系" @click="xg_sxhandleSizeChange('黑白色系')"></el-option>
+                                 <el-option label="经典色系" @click="xg_sxhandleSizeChange('经典色系')"></el-option>
                              </el-select>
                          </el-form-item>
                      </div>
-                 </el-col>
-         
+                 </el-col> -->
+				 <el-col :span="10">
+					 <el-form-item label="色系名称" prop="deliveryDate" class="mab" label-width="110px" style="">
+						 <el-input v-model="edit_formData['颜色']" style="width: 150px;" id="颜色" />
+					 </el-form-item>
+				 </el-col>
+				 
                  <el-col :span="10">
-                     <el-form-item label="生产款号:" prop="deliveryDate" class="mab" label-width="110px" style="">
+                     <el-form-item label="款号:" prop="deliveryDate" class="mab" label-width="110px" style="">
                          <el-input v-model="edit_formData['款号']" style="width: 250px;" id="生产款号" />
                      </el-form-item>
                  </el-col>
@@ -338,10 +346,10 @@
              <el-row :gutter="24">
                  <el-col :span="10">
                      <div style="display: flex; gap: 0px;">
-                         <el-form-item label="是否船样:" prop="joinDate" label-width='110'>
+                        <el-form-item label="是否船样:" prop="joinDate" label-width='110'>
                              <el-select v-model="edit_formData['船样']" style="width: 150px;" id="是否船样" @keydown="add_gdzlent($event, '尺码规格', '是否船样', 'zds1')">
-                                 <el-option label="是" value="是"></el-option>
-                                 <el-option label="否" value="否"></el-option>
+								 <el-option label="是" value="是" @click="edit_cyChange('是')"></el-option>
+								 <el-option label="否" value="否" @click="edit_cyChange('否')"></el-option>
                              </el-select>
                          </el-form-item>
                      </div>
@@ -361,6 +369,7 @@
                              <el-input v-model="edit_cmformdata.cm7" readonly style="width: 80px;" />
                              <el-input v-model="edit_cmformdata.cm8" readonly style="width: 80px;" />
                              <el-input v-model="edit_cmformdata.cm9" readonly style="width: 80px;" />
+							 <el-input v-model="edit_cmformdata.cm10" readonly style="width: 80px;" />
                          </el-form-item>
                      </div>
                  </el-col>
@@ -378,7 +387,8 @@
                              <el-input v-model="edit_zdsformdata.zds6" @input="updateTotal" style="width: 80px;" id="zds6" @keydown="add_gdzlent($event, 'zds5', 'zds6', 'zds7')" />
                              <el-input v-model="edit_zdsformdata.zds7" @input="updateTotal" style="width: 80px;" id="zds7" @keydown="add_gdzlent($event, 'zds6', 'zds7', 'zds8')" />
                              <el-input v-model="edit_zdsformdata.zds8" @input="updateTotal" style="width: 80px;" id="zds8" @keydown="add_gdzlent($event, 'zds7', 'zds8', 'zds9')" />
-                             <el-input v-model="edit_zdsformdata.zds9" readonly style="width: 80px;" id="zds9" @keydown="add_gdzlent($event, 'zds8', 'zds9', '订单子编号')" />
+							 <el-input v-model="edit_zdsformdata.zds9" @input="updateTotal" style="width: 80px;" id="zds9" @keydown="add_gdzlent($event, 'zds8', 'zds9', '色系名称')" />
+                             <el-input v-model="edit_zdsformdata.zds10" readonly style="width: 80px;" />
                          </el-form-item>
                      </div>
                  </el-col>
@@ -513,40 +523,44 @@
             style="width: 70%; max-height: 80%; overflow-y: auto; margin-top: 4%;"
             :title="'新增颜色资料'"
             destroy-on-close>
-            
             <el-form label-width="100px" :model="add_yszlformdata">
               <el-row :gutter="24" class="form-row">
                 <el-col :span="10">
                   <div style="display: flex; gap: 0px;">
-                    <h3 style="color:red;font-size: 24px;margin:-5px 0px 8px 12px;">订单号&nbsp;&nbsp;&nbsp;{{_ddhval}}</h3>
+                    <h3 style="color:red;font-size: 24px;margin:-5px 0px 8px 12px;" >订单号&nbsp;&nbsp;&nbsp;{{_ddhval}}</h3>
                   </div>
                 </el-col>
                 <el-col :span="10">
-                  <el-form-item label="订单子编号:" class="mab" prop="keyOrder" label-width='110'>
+                  <el-form-item label="订单子编号:" class="mab" prop="keyOrder" id ='订单子编号' label-width='110'>
                     <el-input v-model="add_yszlformdata.ddzbh" disabled style="width: 250px;" />
                   </el-form-item>
                 </el-col>
               </el-row>
         
               <el-row :gutter="24" class="form-row">
-                <el-col :span="10">
+                <!-- <el-col :span="10">
                   <el-form-item label="色系名称:" class="mab" prop="keyOrder" label-width='110'>
-                    <el-select v-model="add_yszlformdata.sxmc" style="width: 150px;" @keydown="add_gdzlent($event, '款号', '尺码规格', '是否船样')">
-                      <el-option label="红色系" @click="sxhandleSizeChange('红色系')" ></el-option>
-                      <el-option label="黄色系" @click="sxhandleSizeChange('黄色系')" ></el-option>
-                      <el-option label="蓝色系" @click="sxhandleSizeChange('蓝色系')" ></el-option>
-                      <el-option label="绿色系" @click="sxhandleSizeChange('绿色系')" ></el-option>
-                      <el-option label="紫色系" @click="sxhandleSizeChange('紫色系')" ></el-option>
-                      <el-option label="灰色系" @click="sxhandleSizeChange('灰色系')" ></el-option>
-                      <el-option label="咖啡色系" @click="sxhandleSizeChange('咖啡色系')" ></el-option>
-                      <el-option label="黑白色系" @click="sxhandleSizeChange('黑白色系')" ></el-option>
-                      <el-option label="经典色系" @click="sxhandleSizeChange('经典色系')" ></el-option>
+                    <el-select v-model="add_yszlformdata.sxmc" style="width: 150px;" id ='色系名称'  @keydown="add_gdzlent($event, '款号', '色系名称', '生产款号')">
+                      <el-option label="红色系" @click="xz_sxhandleSizeChange('红色系')" ></el-option>
+                      <el-option label="黄色系" @click="xz_sxhandleSizeChange('黄色系')" ></el-option>
+                      <el-option label="蓝色系" @click="xz_sxhandleSizeChange('蓝色系')" ></el-option>
+                      <el-option label="绿色系" @click="xz_sxhandleSizeChange('绿色系')" ></el-option>
+                      <el-option label="紫色系" @click="xz_sxhandleSizeChange('紫色系')" ></el-option>
+                      <el-option label="灰色系" @click="xz_sxhandleSizeChange('灰色系')" ></el-option>
+                      <el-option label="咖啡色系" @click="xz_sxhandleSizeChange('咖啡色系')" ></el-option>
+                      <el-option label="黑白色系" @click="xz_sxhandleSizeChange('黑白色系')" ></el-option>
+                      <el-option label="经典色系" @click="xz_sxhandleSizeChange('经典色系')" ></el-option>
                     </el-select>
                   </el-form-item>
-                </el-col>
+                </el-col> -->
+				<el-col :span="10">
+				  <el-form-item label="色系名称:" class="mab" prop="keyOrder" label-width="110">
+				    <el-input v-model="add_yszlformdata.sxmc" style="width: 150px;" id ='色系名称' @keydown="add_gdzlent($event, '', '色系名称', '生产款号')"/>
+				  </el-form-item>
+				</el-col>
                 <el-col :span="10">
-                  <el-form-item label="生产款号:" class="mab" prop="keyOrder" label-width="110">
-                    <el-input v-model="add_yszlformdata.kh" style="width: 250px;" @keydown="add_gdzlent($event, '开单员', '款号', '尺码规格')"/>
+                  <el-form-item label="款号:" class="mab" prop="keyOrder" label-width="110">
+                    <el-input v-model="add_yszlformdata.kh" style="width: 250px;" id ='生产款号' @keydown="add_gdzlent($event, '色系名称', '生产款号', '尺码规格')"/>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -554,15 +568,15 @@
               <el-row :gutter="24" class="form-row">
                 <el-col :span="10">
                   <el-form-item label="尺码规格:" prop="joinDate" label-width='110'>
-                    <el-select v-model="add_yszlformdata.cmgg" style="width: 150px;" @keydown="add_gdzlent($event, '款号', '尺码规格', '是否船样')">
-                      <el-option label="32~46" @click="cmhandleSizeChange('尺码数')"></el-option>
+                    <el-select v-model="add_yszlformdata.cmgg" style="width: 150px;" id ='尺码规格'  @keydown="add_gdzlent($event, '生产款号', '尺码规格', '是否船样')">
+                      <el-option label="32~48" @click="cmhandleSizeChange('尺码数')"></el-option>
                       <el-option label="S~XXL" @click="cmhandleSizeChange('尺码')"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="10">
                   <el-form-item label="是否船样:" prop="joinDate" label-width='110'>
-                    <el-select v-model="add_yszlformdata.sfcy" style="width: 150px;" @keydown="add_gdzlent($event, '尺码规格', '是否船样', 'zds1')">
+                    <el-select v-model="add_yszlformdata.sfcy" style="width: 150px;" id ='是否船样'  @keydown="add_gdzlent($event, '尺码规格', '是否船样', 'cm1')">
                       <el-option label="是" value="是" @click="cyChange('是')"></el-option>
                       <el-option label="否" value="否" @click="cyChange('否')"></el-option>
                     </el-select>
@@ -573,15 +587,16 @@
               <el-row :gutter="24" class="form-row">
                 <el-col :span="24">
                   <el-form-item label="尺码:" class="mab" prop="keyOrder" label-width='110'>
-                    <el-input v-model="cmformdata.cm1"  style="width: 80px;"/>
-                    <el-input v-model="cmformdata.cm2"  style="width: 80px;"/>
-                    <el-input v-model="cmformdata.cm3"  style="width: 80px;"/>
-                    <el-input v-model="cmformdata.cm4"  style="width: 80px;"/>
-                    <el-input v-model="cmformdata.cm5"  style="width: 80px;"/>
-                    <el-input v-model="cmformdata.cm6"  style="width: 80px;"/>
-                    <el-input v-model="cmformdata.cm7"  style="width: 80px;"/>
-                    <el-input v-model="cmformdata.cm8"  style="width: 80px;"/>
-                    <el-input v-model="cmformdata.cm9"  style="width: 80px;"/>
+                    <el-input v-model="cmformdata.cm1"  style="width: 80px;" id ='cm1'  @keydown="add_gdzlent($event, '是否船样', 'cm1', 'cm2')"/>
+                    <el-input v-model="cmformdata.cm2"  style="width: 80px;" id ='cm2'  @keydown="add_gdzlent($event, 'cm1', 'cm2', 'cm3')"/>
+                    <el-input v-model="cmformdata.cm3"  style="width: 80px;" id ='cm3'  @keydown="add_gdzlent($event, 'cm2', 'cm3', 'cm4')"/>
+                    <el-input v-model="cmformdata.cm4"  style="width: 80px;" id ='cm4'  @keydown="add_gdzlent($event, 'cm3', 'cm4', 'cm5')"/>
+                    <el-input v-model="cmformdata.cm5"  style="width: 80px;" id ='cm5'  @keydown="add_gdzlent($event, 'cm4', 'cm5', 'cm6')"/>
+                    <el-input v-model="cmformdata.cm6"  style="width: 80px;" id ='cm6'  @keydown="add_gdzlent($event, 'cm5', 'cm6', 'cm7')"/>
+                    <el-input v-model="cmformdata.cm7"  style="width: 80px;" id ='cm7'  @keydown="add_gdzlent($event, 'cm6', 'cm7', 'cm8')"/>
+                    <el-input v-model="cmformdata.cm8"  style="width: 80px;" id ='cm8'  @keydown="add_gdzlent($event, 'cm7', 'cm8', 'cm9')"/>
+					<el-input v-model="cmformdata.cm9"  style="width: 80px;" id ='cm9'  @keydown="add_gdzlent($event, 'cm8', 'cm9', 'zds1')"/>
+                    <el-input v-model="cmformdata.cm10"  style="width: 80px;"/>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -589,15 +604,16 @@
               <el-row :gutter="24" class="form-row">
                 <el-col :span="24">
                   <el-form-item label="制单数:" class="mab" prop="keyOrder" label-width='110'>
-                    <el-input v-model="zdsformdata.zds1" @input="updateTotal" style="width: 80px;" @keydown="add_gdzlent($event, '是否船样', 'zds1', 'zds2')"/>
-                    <el-input v-model="zdsformdata.zds2" @input="updateTotal" style="width: 80px;" @keydown="add_gdzlent($event, 'zds1', 'zds2', 'zds3')"/>
-                    <el-input v-model="zdsformdata.zds3" @input="updateTotal" style="width: 80px;" @keydown="add_gdzlent($event, 'zds2', 'zds3', 'zds4')"/>
-                    <el-input v-model="zdsformdata.zds4" @input="updateTotal" style="width: 80px;" @keydown="add_gdzlent($event, 'zds3', 'zds4', 'zds5')"/>
-                    <el-input v-model="zdsformdata.zds5" @input="updateTotal" style="width: 80px;" @keydown="add_gdzlent($event, 'zds4', 'zds5', 'zds6')"/>
-                    <el-input v-model="zdsformdata.zds6" @input="updateTotal" style="width: 80px;" @keydown="add_gdzlent($event, 'zds5', 'zds6', 'zds7')"/>
-                    <el-input v-model="zdsformdata.zds7" @input="updateTotal" style="width: 80px;" @keydown="add_gdzlent($event, 'zds6', 'zds7', 'zds8')"/>
-                    <el-input v-model="zdsformdata.zds8" @input="updateTotal" style="width: 80px;" @keydown="add_gdzlent($event, 'zds7', 'zds8', 'zds9')"/>
-                    <el-input v-model="zdsformdata.zds9" readonly style="width: 80px;" @keydown="add_gdzlent($event, 'zds8', 'zds9', '订单子编号')"/>
+                    <el-input v-model="zdsformdata.zds1" @input="updateTotal" style="width: 80px;" id ='zds1'  @keydown="add_gdzlent($event, 'cm9', 'zds1', 'zds2')"/>
+                    <el-input v-model="zdsformdata.zds2" @input="updateTotal" style="width: 80px;" id ='zds2'  @keydown="add_gdzlent($event, 'zds1', 'zds2', 'zds3')"/>
+                    <el-input v-model="zdsformdata.zds3" @input="updateTotal" style="width: 80px;" id ='zds3'  @keydown="add_gdzlent($event, 'zds2', 'zds3', 'zds4')"/>
+                    <el-input v-model="zdsformdata.zds4" @input="updateTotal" style="width: 80px;" id ='zds4'  @keydown="add_gdzlent($event, 'zds3', 'zds4', 'zds5')"/>
+                    <el-input v-model="zdsformdata.zds5" @input="updateTotal" style="width: 80px;" id ='zds5'  @keydown="add_gdzlent($event, 'zds4', 'zds5', 'zds6')"/>
+                    <el-input v-model="zdsformdata.zds6" @input="updateTotal" style="width: 80px;" id ='zds6'  @keydown="add_gdzlent($event, 'zds5', 'zds6', 'zds7')"/>
+                    <el-input v-model="zdsformdata.zds7" @input="updateTotal" style="width: 80px;" id ='zds7'  @keydown="add_gdzlent($event, 'zds6', 'zds7', 'zds8')"/>
+                    <el-input v-model="zdsformdata.zds8" @input="updateTotal" style="width: 80px;" id ='zds8'  @keydown="add_gdzlent($event, 'zds7', 'zds8', 'zds9')"/>
+					<el-input v-model="zdsformdata.zds9" @input="updateTotal" style="width: 80px;" id ='zds9'  @keydown="add_gdzlent($event, 'zds8', 'zds9', '色系名称')"/>
+                    <el-input v-model="zdsformdata.zds10" readonly style="width: 80px;" />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -781,7 +797,9 @@ import { useUserStore } from '@/pinia/modules/user'
 import axios from 'axios';
 import * as XLSX from 'xlsx';
 import jsPDF from 'jspdf';
-import {Datalist,WorkOrderList,WorkOrderAdd,PrintListData,printDetailAdd,PrintDetailDel,orderDataDel,getWorkOrder,getSuborder,PrintDataEdit,WorkOrderEdit,gdAnnexAdd,upload,OrderAttachments} from '@/api/mes/job'
+import {Datalist,WorkOrderList,WorkOrderAdd,PrintListData,
+printDetailAdd,PrintDetailDel,orderDataDel,getWorkOrder,
+getSuborder,PrintDataEdit,WorkOrderEdit,gdAnnexAdd,upload,OrderAttachments} from '@/api/mes/job'
 import PrintPage from './components/print.vue'
 import AddGongYi from './components/addGongYi.vue'  
 defineOptions({name: 'Company'})
@@ -933,7 +951,8 @@ const edit_cmformdata = reactive({
   cm6:'',
   cm7:'',
   cm8:'',
-  cm9:'总计',
+  cm9:'',
+  cm10:'总计',
 });
 const edit_zdsformdata = reactive({
   zds1:'',
@@ -945,14 +964,20 @@ const edit_zdsformdata = reactive({
   zds7:'',
   zds8:'',
   zds9:'',
+  zds10:'',
 });
-const edit_formData = ref({})
-
+// const edit_formData = ref({})
+const Uniqid = ref('')
 //颜色资料表格双击
 const ysupdateCompanyFunc = async (row) => {
 	dialogFormVisible.value = true;
 	edit_formData.value = { ...row };
-
+	console.log(row)
+	edit_formData['子订单编号'] = row['子订单编号']
+	edit_formData['款号'] = row['款号']
+	edit_formData['颜色'] = row['颜色']
+	Uniqid.value = row['Uniqid']
+	
   let index = 1;  
   // 创建一个函数来构建尺码和数量的映射  
   function buildSizeQuantitiesMap(sizes, formData) {  
@@ -972,6 +997,7 @@ const ysupdateCompanyFunc = async (row) => {
       edit_params[`cmsl${index++}`] = quantity;  
     }  
     console.log(edit_params)
+    
     edit_cmformdata['cm1'] = edit_params['cm1']
     edit_cmformdata['cm2'] = edit_params['cm2']
     edit_cmformdata['cm3'] = edit_params['cm3']
@@ -980,6 +1006,7 @@ const ysupdateCompanyFunc = async (row) => {
     edit_cmformdata['cm6'] = edit_params['cm6']
     edit_cmformdata['cm7'] = edit_params['cm7']
     edit_cmformdata['cm8'] = edit_params['cm8']
+	edit_cmformdata['cm9'] = edit_params['cm9']
     edit_zdsformdata['zds1'] = edit_params['cmsl1']
     edit_zdsformdata['zds2'] = edit_params['cmsl2']
     edit_zdsformdata['zds3'] = edit_params['cmsl3']
@@ -988,17 +1015,26 @@ const ysupdateCompanyFunc = async (row) => {
     edit_zdsformdata['zds6'] = edit_params['cmsl6']
     edit_zdsformdata['zds7'] = edit_params['cmsl7']
     edit_zdsformdata['zds8'] = edit_params['cmsl8']
+	edit_zdsformdata['zds9'] = edit_params['cmsl9']
     //updateTotal()计算尺码数量总数合计
     updateTotal()
 };
 
+//点击是否船样 改变子订单编号
+const edit_cyChange = async (value) => {
+  if (value === '是') {
+		const getSuborders = await getSuborder({order:_Gd_gdbh.value,cy:'是'});
+		edit_formData['子订单编号'] = getSuborders.data;
+	}else if(value === '否'){
+		const getSuborders = await getSuborder({order:_Gd_gdbh.value,cy:'否'});
+		edit_formData['子订单编号'] = getSuborders.data.order;
+  }
+};
 
 // 修改确认
 const ys_edit_Dialog = async () => {
-//   console.log(sizeDatas)
-//   console.log(edit_formData)
+  // console.log(edit_formData)	
 if (!edit_formData.value) return;
-// 创建一个函数来构建尺码和数量的映射  
 function buildSizeQuantitiesMap(sizes, formData) {  
     const sizeQuantitiesMap = {};  
     sizes.forEach(size => {  
@@ -1014,24 +1050,48 @@ function buildSizeQuantitiesMap(sizes, formData) {
   let index = 1;  
   const params = {  
     订单编号: edit_formData.value.订单编号,  
-    子订单编号: edit_formData.value.子订单编号,  
-    款号: edit_formData.value.款号,  
-    船样: edit_formData.value.船样 === 1 ? '是' : '否', // 转换船样字段  
-    颜色: edit_formData.value.颜色,  
-    zdtotal: edit_formData.value.zdtotal,  
+    子订单编号: edit_formData.子订单编号,  
+    款号: edit_formData.款号,  
+    船样: edit_formData.船样 === 1 ? '是' : '否', // 转换船样字段  
+    颜色: edit_formData.颜色,  
+    zdtotal: edit_zdsformdata.zds10,  
     Sys_id: edit_formData.value.Sys_id,  
-    id: edit_formData.value.Uniqid,  
+    id: Uniqid.value,  
   };  
   // buildSizeQuantitiesMap()
   for (const [size, quantity] of Object.entries(sizeQuantitiesMap)) {  
     params[`cm${index}`] = size;  
     params[`cmsl${index}`] =+ edit_zdsformdata[`zds${index++}`];  
   }  
-  console.log(params);
+  // console.log(params); return;
   const PrintDataEdit_list = await PrintDataEdit(params);
   if(PrintDataEdit_list.code === 0){
 	  dialogFormVisible.value = false;
     ElMessage({type: 'success',message: '修改成功'})
+	
+	//数据列表显示
+	const PrintListDatas = await PrintListData({order:_Gd_gdbh.value})
+	const jsOrderAttachments = await OrderAttachments({order:_Gd_gdbh.value,desc:'技术附件'})
+	const ddOrderAttachments = await OrderAttachments({order:_Gd_gdbh.value,desc:'订单资料附件'})
+	
+	//颜色资料
+	if(PrintListDatas.data.列表.length === 0 ){
+	  ystableData.length = 0
+	}else{
+	  sizeDatas.splice(0,PrintListDatas.data.型号.length,...PrintListDatas.data.型号);//型号数据
+	  ystableData.splice(0,PrintListDatas.data.列表.length,...PrintListDatas.data.列表);//表格数据
+	  // 使用 map 方法创建一个新数组,并转换船样字段  
+	  const newData = PrintListDatas.data.列表.map(item => ({  
+	      ...item,  
+	      船样: item.船样 === 1 ? '是' : '否'  
+	  }));  
+	  // 将新数组赋值给 ystableData,这会触发视图更新,清空旧数据(可选,如果不需要保留旧数据的话)  
+	  ystableData.length = 0;  
+	  ystableData.push(...newData);
+	}
+	
+	
+	
     tableRowClick(params)
   }else{
     ElMessage({type: 'error',message: '修改失败'})
@@ -1118,7 +1178,7 @@ const addgd_onclick = async ()=>{
     add_gdscgdformData['订单编号'] = getWorkOrder_list.data;
     add_gdscgdformData['客户编号'] = _Gd_khdh.value
     add_gdscgdformData['Sys_id'] = _username.value 
-	add_gdscgdformData['制单日期'] = currentDates
+	add_gdscgdformData['制单日期'] = currentDate
 	
     add_gdscgdformData['生产款号'] = ''
     add_gdscgdformData['款式'] = ''
@@ -1225,7 +1285,8 @@ const cmformdata = reactive({
   cm6:'42',
   cm7:'44',
   cm8:'46',
-  cm9:'总计',
+  cm9:'48',
+  cm10:'总计',
 });
 const zdsformdata = reactive({
   zds1:'',
@@ -1237,12 +1298,15 @@ const zdsformdata = reactive({
   zds7:'',
   zds8:'',
   zds9:'',
+  zds10:'',
 });
-const sxhandleSizeChange = (value) => {
+
+
+const xz_sxhandleSizeChange = (value) => {
   // console.log(value)
   if (value === '红色系') {
     add_yszlformdata.sxmc = '红色系'
-	} else if(value === '黄色系'){
+  } else if(value === '黄色系'){
     add_yszlformdata.sxmc = '黄色系'
   }else if(value === '蓝色系'){
     add_yszlformdata.sxmc = '蓝色系'
@@ -1261,6 +1325,33 @@ const sxhandleSizeChange = (value) => {
   }
 };
 
+const edit_formData = reactive({
+  '颜色': ''
+});
+
+const xg_sxhandleSizeChange = (value) => {
+  console.log(value)
+  if (value === '红色系') {
+    edit_formData['颜色'] = '红色系'
+  } else if(value === '黄色系'){
+    edit_formData['颜色'] = '黄色系'
+  }else if(value === '蓝色系'){
+    edit_formData['颜色'] = '蓝色系'
+  }else if(value === '绿色系'){
+    edit_formData['颜色'] = '绿色系'
+  }else if(value === '紫色系'){
+    edit_formData['颜色'] = '紫色系'
+  }else if(value === '灰色系'){
+    edit_formData['颜色'] = '灰色系'
+  }else if(value === '咖啡色系'){
+    edit_formData['颜色'] = '咖啡色系'
+  }else if(value === '黑白色系'){
+    edit_formData['颜色'] = '黑白色系'
+  }else if(value === '经典色系'){
+    edit_formData['颜色'] = '经典色系'
+  }
+};
+
 const cmhandleSizeChange = (value) => {
   // console.log(value)
   if (value === '尺码数') {
@@ -1272,7 +1363,8 @@ const cmhandleSizeChange = (value) => {
 	  cmformdata.cm6 = '42';
 	  cmformdata.cm7 = '44';
 	  cmformdata.cm8 = '46';
-	  cmformdata.cm9 = '总计';
+	  cmformdata.cm9 = '48';
+	  cmformdata.cm10 = '总计';
 	} else if (value === '尺码') {
 	  cmformdata.cm1 = 'S';
 	  cmformdata.cm2 = 'M';
@@ -1282,7 +1374,8 @@ const cmhandleSizeChange = (value) => {
 	  cmformdata.cm6 = '3XL';
 	  cmformdata.cm7 = '4XL';
 	  cmformdata.cm8 = '';
-	  cmformdata.cm9 = '总计';
+	  cmformdata.cm9 = '';
+	  cmformdata.cm10 = '总计';
 	}
 };
 //清空对象的属性值
@@ -1296,20 +1389,22 @@ const gdyj_clearFormData = () => {
 //自动计算制单数总计
 function updateTotal() {  
   // 直接指定要累加的属性名  
-  const relevantKeys = ['zds1', 'zds2', 'zds3', 'zds4', 'zds5', 'zds6', 'zds7', 'zds8'];  
+  const relevantKeys = ['zds1', 'zds2', 'zds3', 'zds4', 'zds5', 'zds6', 'zds7', 'zds8', 'zds9'];  
   const values = relevantKeys.map(key => parseInt(zdsformdata[key], 10) || 0); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
-  zdsformdata.zds9 = values.reduce((sum, value) => sum + value, 0);  
+  zdsformdata.zds10 = values.reduce((sum, value) => sum + value, 0);  
   const valuess = relevantKeys.map(key => parseInt(edit_zdsformdata[key], 10) || 0); // 使用 || 0 来处理可能的 NaN 或 undefined/null  
-  edit_zdsformdata.zds9 = valuess.reduce((sum, value) => sum + value, 0); 
+  edit_zdsformdata.zds10 = valuess.reduce((sum, value) => sum + value, 0); 
 }  
 
-//
+//点击是否船样 改变子订单编号
 const cyChange = async (value) => {
-  const getSuborders = await getSuborder({order:_Gd_gdbh.value});
   if (value === '是') {
-    add_yszlformdata.ddzbh = _Gd_gdbh.value + '-99'
+		add_yszlformdata.ddzbh = _Gd_gdbh.value + '-99'
+		const getSuborders = await getSuborder({order:_Gd_gdbh.value,cy:'是'});
+		add_yszlformdata['ddzbh'] = getSuborders.data;
 	}else if(value === '否'){
-    add_yszlformdata.ddzbh = getSuborders.data
+		const getSuborders = await getSuborder({order:_Gd_gdbh.value,cy:'否'});
+		add_yszlformdata['ddzbh'] = getSuborders.data.order;
   }
 };
 
@@ -1319,13 +1414,28 @@ const addgdyj_onclick = async  () => {
     ElMessage({type: 'warning',message: '请选择具体的工单后,再操作此功能'})
     return false;
   }else{
-    const getSuborders = await getSuborder({order:_Gd_gdbh.value});
-    add_gdyjdialogFormVisible.value = true
+	add_gdyjdialogFormVisible.value = true
+    const getSuborders = await getSuborder({order:_Gd_gdbh.value,cy:'否'});
+	add_yszlformdata['ddzbh'] = getSuborders.data.order;
+	// 假设获取的数据是 getSuborders.data
+	if (getSuborders.data.cm) {
+	  // 判断并赋值
+	  cmformdata.cm1 = getSuborders.data.cm.cm1 || '';
+	  cmformdata.cm2 = getSuborders.data.cm.cm2 || '';
+	  cmformdata.cm3 = getSuborders.data.cm.cm3 || '';
+	  cmformdata.cm4 = getSuborders.data.cm.cm4 || '';
+	  cmformdata.cm5 = getSuborders.data.cm.cm5 || '';
+	  cmformdata.cm6 = getSuborders.data.cm.cm6 || '';
+	  cmformdata.cm7 = getSuborders.data.cm.cm7 || '';
+	  cmformdata.cm8 = getSuborders.data.cm.cm8 || '';
+	  cmformdata.cm9 = getSuborders.data.cm.cm9 || '';
+	  cmformdata.cm10 = '合计';
+	}
+
     add_yszlformdata['ddh'] = _Gd_gdbh.value;
-    add_yszlformdata['ddzbh'] = getSuborders.data;
     add_yszlformdata['ys'] = '';
 	add_yszlformdata['kh'] = '';
-	add_yszlformdata['sxmc'] = '';
+	// add_yszlformdata['sxmc'] = '';
     add_yszlformdata['cmgg'] = '32~46';
     add_yszlformdata['sfcy'] = '否';
     add_yszlformdata['kdy'] = _username.value;
@@ -1333,8 +1443,18 @@ const addgdyj_onclick = async  () => {
   }
 }
 
-//新增颜色资料按钮确定
+//新增颜色资料确定
 const add_gdyjenterDialog =  async  () => {
+	//必填
+	if(add_yszlformdata['kh'] === ''){
+		ElMessage({type: 'warning',message: '款号不能为空'})
+		return false;
+	}
+	if(add_yszlformdata['sxmc'] === ''){
+		ElMessage({type: 'warning',message: '色系名称不能为空'})
+		return false;
+	}
+
   let cy = '';
   if(add_yszlformdata['sfcy'] === '是'){
      cy = '1'
@@ -1356,6 +1476,7 @@ const add_gdyjenterDialog =  async  () => {
     cm6: cmformdata['cm6'],
     cm7: cmformdata['cm7'],
     cm8: cmformdata['cm8'],
+	cm9: cmformdata['cm9'],
     // 合计: zdsformdata['cm9'],
 		cmsl1: zdsformdata['zds1'],
     cmsl2: zdsformdata['zds2'],
@@ -1365,7 +1486,8 @@ const add_gdyjenterDialog =  async  () => {
     cmsl6: zdsformdata['zds6'],
     cmsl7: zdsformdata['zds7'],
     cmsl8: zdsformdata['zds8'],
-    zdtotal: zdsformdata['zds9'],
+	cmsl9: zdsformdata['zds9'],
+    zdtotal: zdsformdata['zds10'],
 
     // 图片:previewFiles['value']['0']['name']
 	};
@@ -1617,8 +1739,6 @@ const tableRowClick = async (row) => {
         const jsOrderAttachments = await OrderAttachments({order:_Gd_gdbh.value,desc:'技术附件'})
         const ddOrderAttachments = await OrderAttachments({order:_Gd_gdbh.value,desc:'订单资料附件'})
 		
-		
-		
 		//颜色资料
         if(PrintListDatas.data.列表.length === 0 ){
           ystableData.length = 0
@@ -1810,7 +1930,7 @@ const delgd_delclick = async () => {
     const summableLabels = [...sizeDatas, "制单总数"];
     columns.forEach((column, index) => {  
         if (index === 1) {  
-            sums[index] = '订单制单总数量合计';  
+            sums[index] = '总数量合计';  
             return;  
         }  
   
@@ -1985,6 +2105,9 @@ const yulan = (event) =>{
 		$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/assets/iconfont/iconfont.css'));
 
 }
+
+
+
 const jsfj_del = (row) =>{
 	ElMessageBox.confirm('确定要删除吗?', '提示', {
 	    confirmButtonText: '确定',
@@ -2071,6 +2194,59 @@ const jsfjenterDialog = () => {
 	}
 }
 
+
+//订单资料附件
+const gdbomupdateCompanyFunc = (row) =>{
+	if(!row.附件内容) return
+	$.getScript('/luckysheet/plugins/js/plugin.js', () => {
+		$script('/luckysheet/luckysheet.umd.js', () => {
+					function dataURLtoBlob(dataUrl) {
+					    const byteString = atob(dataUrl.split(',')[1]);
+					    const ab = new ArrayBuffer(byteString.length);
+					    const ia = new Uint8Array(ab);
+
+					    for (let i = 0; i < byteString.length; i++) {
+					        ia[i] = byteString.charCodeAt(i);
+					    }
+
+					    return new Blob([ab], { type: 'application/octet-stream' });
+					}
+
+					const blob = dataURLtoBlob(row.附件内容);
+					luckyexcelVisible.value = true
+					LuckyExcel.transformExcelToLucky(blob, function(exportJson, luckysheetfile){
+						if(exportJson.sheets==null || exportJson.sheets.length==0){
+							alert("Failed to read the content of the excel file, currently does not support xls files!");
+							return;
+						}
+						if(luckyExcel) luckyExcel.destroy();
+						luckysheet.create({
+							container: 'luckyexcel', //容器的ID
+							data: exportJson.sheets,
+							title: exportJson.info.name, // 工作簿名称
+							lang: "zh", // 设定表格语言 国际化设置,允许设置表格的语言,支持中文("zh")和英文("en")
+							showtoolbar: false, // 是否显示工具栏
+							showinfobar: false, // 是否显示顶部信息栏
+							allowEdit: false, // 是否允许前台编辑
+							enableAddRow: false, // 允许增加行
+							enableAddCol: false, // 允许增加列
+							userInfo: false, // 右上角的用户信息展示样式
+							showRowBar: false, // 是否显示行号区域
+							showColumnBar: false, // 是否显示列号区域
+							sheetFormulaBar: false, // 是否显示公式栏
+							enableAddBackTop: false,//返回头部按钮
+						});
+						luckyExcel = luckysheet;
+					})
+		})
+	})
+	$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/css/pluginsCss.css'));
+	$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/plugins.css'));
+	$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/css/luckysheet.css'));
+	$('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/assets/iconfont/iconfont.css'));
+}
+
+
 //技术资料excel展示
 const ExcelShow = (row) =>{
 	console.log("技术资料excel展示")

+ 44 - 12
src/view/yunyin/shengchanguanli/yuedudahuoshengchanjindu.vue

@@ -8,6 +8,15 @@
 			  <el-form-item>
 				<el-input v-model="searchInfo" placeholder="搜索" style="width: 180px;"></el-input>
 				<el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
+				<!-- <div style="margin-left: auto"> -->
+				  <el-button
+				    type="primary"
+				    class="bt"
+				    icon="download"
+				    @click="exportToExcel2"
+				    >导出到Excel</el-button
+				  >
+				<!-- </div>	 -->
 				<!-- <el-button type="primary" icon="edit"   @click="gd_gxclhconClick"  class="bt" title="修改">修改</el-button> -->
 			  </el-form-item>
 			</el-form>
@@ -35,7 +44,7 @@
 						:row-style="{ height: '25px' }"  :header-cell-style="{ padding: '0px' }"
 						:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 						:data="tableData"  border row-key="ID"
-						size="small"
+						size="small" id="tab"
 						:cell-class-name="gxbgCellClass"
 						highlight-current-row="true" @row-dblclick="updateCompanyFunc"
 						@row-click="tableRowClick" :show-overflow-tooltip="true"
@@ -70,17 +79,18 @@
 	</div>
   </template>
   <script setup>
-  // 全量引入格式化工具 请按需保留
-  import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
-  import {ref, reactive} from 'vue'
-  import {dateList,OrderYieldList,Datalist} from '@/api/mes/job'
-
-  import PrintPage from './components/print.vue'
-  import {ElMessage} from "element-plus";
-  defineOptions({name: 'Company'})
-  // =========== 获取左侧树侧形结构 ===========
-  const treeData = ref([]);  
-  const _department_code = ref(null)
+// 全量引入格式化工具 请按需保留
+import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
+import {ref, reactive} from 'vue'
+import {dateList,OrderYieldList,Datalist} from '@/api/mes/job'
+import * as XLSX from 'xlsx'
+import FileSaver from 'file-saver'
+import PrintPage from './components/print.vue'
+import {ElMessage} from "element-plus";
+defineOptions({name: 'Company'})
+// =========== 获取左侧树侧形结构 ===========
+const treeData = ref([]);  
+const _department_code = ref(null)
 const getDepartmentdata = async () => {  
   try {  
 	const Datalists = await Datalist();
@@ -151,6 +161,28 @@ getDepartmentdata();
 	}
   };
   
+  //导出到Excel
+  const exportToExcel2 = () => {
+      const el = document.getElementById("tab");
+      // 文件名
+      const filename = "导出到excel.xlsx";
+      const wb = XLSX.utils.table_to_book(el, { raw: true });
+      const wbout = XLSX.write(wb, {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "array",
+      });
+      try {
+        FileSaver.saveAs(
+          new Blob([wbout], { type: "application/octet-stream" }),
+          filename
+        );
+      } catch (e) {
+        console.log(e);
+      }
+      return wbout;
+  };
+  
   const _workOrderDetailList = async ()=>{
 	const OrderYieldListtable = await OrderYieldList({client:_khbh.value,search:'',mouth:''});
 	console.log(OrderYieldListtable)

部分文件因为文件数量过多而无法显示