Bladeren bron

生产管理

liuhairui 1 jaar geleden
bovenliggende
commit
476dcd5f51

+ 363 - 363
src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -605,19 +605,19 @@
                       @row-click="tableRowClick"
                       :show-overflow-tooltip="true">
               <el-table-column type="selection" width="30" />
-              <el-table-column   align="left" label="产品编号" prop="产品编号" width="115" />
-              <el-table-column   align="left" label="产品名称" prop="产品名称" width="340" />
-              <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="receiveDate" width="160" />
-              <el-table-column   align="left" label="印件数" prop="yjData" width="100" />
-              <el-table-column   align="left" label="工艺" prop="gyData" width="100"/>
-              <el-table-column   align="left" label="当前状态" prop="状态"  width="100"/>
-              <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  sortable align="left" label="产品编号" prop="产品编号" width="115" />
+              <el-table-column  sortable align="left" label="产品名称" prop="产品名称" width="340" />
+              <el-table-column  sortable align="left" label="版本号" prop="版本号" width="100"/>
+              <el-table-column  sortable align="left" label="成品规格" prop="成品规格" width="100" />
+              <el-table-column  sortable align="left" label="单位" prop="计量单位" width="100"/>
+              <el-table-column  sortable align="left" label="产品分类" prop="产品类别" width="100" />
+              <el-table-column  sortable align="left" label="最近接单时间" prop="receiveDate" width="160" />
+              <el-table-column  sortable align="left" label="印件数" prop="yjData" width="100" />
+              <el-table-column  sortable align="left" label="工艺" prop="gyData" width="100"/>
+              <el-table-column  sortable align="left" label="当前状态" prop="状态"  width="100"/>
+              <el-table-column  sortable align="left" label="最后修改" prop="Sys_id" width="160" />
+              <el-table-column  sortable align="left" label="建档日期" prop="Sys_rq" width="160" />
+              <el-table-column   sortable align="left" label="更新日期" prop="Mod_rq" width="160" />
             </el-table>
             <div class="gva-pagination">
               <el-pagination
@@ -645,19 +645,19 @@
                         @row-dblclick="yjupdateCompanyFunc"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
                 <el-table-column  type="selection" width="30" />
-                <el-table-column  align="left" label="印件号" prop="yj_yjno"  width="80"/>
-                <el-table-column  align="left" label="印件代号" prop="yj_yjdh" width="100" />
-                <el-table-column  align="left" label="印件名称" prop="yj_yjmc" width="540" />
-                <el-table-column  align="left" label="纸张单号" prop="yj_zzdh" width="100"/>
-                <el-table-column  align="left" label="纸张名称" prop="yj_zzmc" width="340"/>
-                <el-table-column  align="left" label="投料规格" prop="yj_tlgg" width="240"/>
-                <el-table-column  align="left" label="开料规格" prop="yj_klgg" width="100"/>
-                <el-table-column  align="left" label="开数" prop="yj_ks" width="80" />
-                <el-table-column  align="left" label="联数" prop="yj_ls" width="80" />
-                <el-table-column  align="left" label="备注" prop="yj_desc" width="200" />
-                <el-table-column  align="left" label="建档用户" prop="sys_id" width="130" />
-                <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" sortable label="印件号" prop="yj_yjno"  width="100"/>
+                <el-table-column  align="left" sortable label="印件代号" prop="yj_yjdh" width="110" />
+                <el-table-column  align="left" sortable label="印件名称" prop="yj_yjmc" width="540" />
+                <el-table-column  align="left" sortable label="纸张单号" prop="yj_zzdh" width="110"/>
+                <el-table-column  align="left" sortable label="纸张名称" prop="yj_zzmc" width="340"/>
+                <el-table-column  align="left" sortable label="投料规格" prop="yj_tlgg" width="240"/>
+                <el-table-column  align="left" sortable label="开料规格" prop="yj_klgg" width="110"/>
+                <el-table-column  align="left" sortable label="开数" prop="yj_ks" width="100" />
+                <el-table-column  align="left" sortable label="联数" prop="yj_ls" width="100" />
+                <el-table-column  align="left" sortable label="备注" prop="yj_desc" width="200" />
+                <el-table-column  align="left" sortable label="建档用户" prop="sys_id" width="130" />
+                <el-table-column  align="left" sortable label="建档日期" prop="sys_rq" width="160" />
+                <el-table-column  align="left" sortable label="更新日期" prop="mod_rq" width="160"/>
               </el-table>
             </el-tab-pane>
 
@@ -720,34 +720,34 @@
               </el-table>
             </el-tab-pane>
 
-            <el-tab-pane label="技术资料附件" @click="showTable('技术资料附件')" name="fourth">
-				<el-table ref="multipleTable"
-                        :row-style="{ height: '20px' }"
-                        :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-                        :header-cell-style="{ padding: '0px' }"
-                        :show-overflow-tooltip="true"
-                        highlight-current-row="true"
-                        style="width: 100%;height: 40vh" 
-						border tooltip-effect="dark" 
-						:data="jstableData" 
-						row-key="ID" 
-						@row-dblclick="ExcelShow"
-						@selection-change="handleSelectionChange">
-                <!--              <el-table-column type="selection" width="55" />-->
-                <el-table-column align="left"  label="序号" prop="序号"  width="120"/>
-                <el-table-column align="left"  label="适用工序" prop="适用工序" width="120" />
-                <el-table-column align="left"  label="备注" prop="附件备注" width="120" />
-                <el-table-column align="left"  label="文件类型" prop="附件类型" width="120"/>
-                <el-table-column align="left"  label="关联产品" prop="关联产品"  width="360"/>
-                <el-table-column align="left"  label="建档用户" prop="sys_id" width="120"/>
-                <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 fixed="right" label="操作" width="100">
-				    <template v-slot="{ row }">
-				      <button @click="jsfj_del(row)">删除</button>
-				    </template>
-				  </el-table-column>
-              </el-table>
+            <el-tab-pane label="技术资料附件" @click="showTable('技术资料附件')" name="fourth">
+				<el-table ref="multipleTable"
+                        :row-style="{ height: '20px' }"
+                        :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+                        :header-cell-style="{ padding: '0px' }"
+                        :show-overflow-tooltip="true"
+                        highlight-current-row="true"
+                        style="width: 100%;height: 40vh"
+						border tooltip-effect="dark"
+						:data="jstableData"
+						row-key="ID"
+						@row-dblclick="ExcelShow"
+						@selection-change="handleSelectionChange">
+                <!--              <el-table-column type="selection" width="55" />-->
+                <el-table-column align="left"   label="序号" prop="序号"  width="120"/>
+                <el-table-column align="left"  label="适用工序" prop="适用工序" width="120" />
+                <el-table-column align="left"  label="备注" prop="附件备注" width="120" />
+                <el-table-column align="left"  label="文件类型" prop="附件类型" width="120"/>
+                <el-table-column align="left"  label="关联产品" prop="关联产品"  width="360"/>
+                <el-table-column align="left"  label="建档用户" prop="sys_id" width="120"/>
+                <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 fixed="right" label="操作" width="100">
+				    <template v-slot="{ row }">
+				      <button @click="jsfj_del(row)">删除</button>
+				    </template>
+				  </el-table-column>
+              </el-table>
             </el-tab-pane>
           </el-tabs>
 
@@ -1457,44 +1457,44 @@
               </div>
             </el-form>
           </el-dialog>
-
+
 		<!-- 技术附件 -->
           <el-dialog v-model="jsfjdialogFormVisible" :before-close="jsfjcloseDialog" :title="产品技术附件资料" style="margin-top: 40px" height="500px" width="800px" destroy-on-close>
 			  <el-form :model="jsfjformdata" label-position="right" ref="elFormRef" :rules="rule" label-width="75px">
-				<el-row :gutter="24">
-					<el-col :span="6">
-					  <el-form-item label="序号:" prop="address" class="mab">
-						<el-input v-model="jsfjformdata.序号"  id="序号" style="width: 140px;"  />
-					  </el-form-item>
-					</el-col>
-					<el-col :span="18">
-					  <el-form-item label="附件备注:" prop="address" class="mab">
-						<el-input v-model="jsfjformdata.附件备注"  id="附件备注" />
-					  </el-form-item>
-					</el-col>
-				</el-row>
-				<el-row :gutter="24">
-					<el-col :span="24">
-						<el-form-item label="适用工序:" prop="address" class="mab">
-							<el-input v-model="jsfjformdata.适用工序"  id="适用工序" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row :gutter="24">
+				<el-row :gutter="24">
+					<el-col :span="6">
+					  <el-form-item label="序号:" prop="address" class="mab">
+						<el-input v-model="jsfjformdata.序号"  id="序号" style="width: 140px;"  />
+					  </el-form-item>
+					</el-col>
+					<el-col :span="18">
+					  <el-form-item label="附件备注:" prop="address" class="mab">
+						<el-input v-model="jsfjformdata.附件备注"  id="附件备注" />
+					  </el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="24">
+					<el-col :span="24">
+						<el-form-item label="适用工序:" prop="address" class="mab">
+							<el-input v-model="jsfjformdata.适用工序"  id="适用工序" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="24">
 					<el-col :span="24">
 					  <el-form-item label="关联产品:" prop="address" class="mab">
 						<el-input v-model="jsfjformdata.关联产品"  id="关联产品" />
 					  </el-form-item>
-					</el-col>
-				</el-row>
-				<el-row :gutter="24">
-					<el-col :span="6"></el-col>
-					<el-col :span="12">
-						<input style="font-size:16px;" type="file" @change="uploadExcel" >
-					</el-col>
-					<el-col :span="6">
-						<el-button @click="yulan">预览</el-button>
-					</el-col>
+					</el-col>
+				</el-row>
+				<el-row :gutter="24">
+					<el-col :span="6"></el-col>
+					<el-col :span="12">
+						<input style="font-size:16px;" type="file" @change="uploadExcel" >
+					</el-col>
+					<el-col :span="6">
+						<el-button @click="yulan">预览</el-button>
+					</el-col>
 				</el-row>
 			  </el-form>
 			  <template #footer>
@@ -1504,10 +1504,10 @@
 				</div>
 			  </template>
 			</el-dialog>
-
+
 <el-dialog v-model="luckyexcelVisible" :before-close="luckyexcelCloseDialog" width="100%" top="0vh">
   <div id="luckyexcel" style="width: 100%;height: 90vh;"></div>
-</el-dialog>
+</el-dialog>
 
         </layout-content>
 
@@ -1555,7 +1555,7 @@ export default {
 </script>
 <script setup>
 // 全量引入格式化工具 请按需保留
-import $script from 'scriptjs'
+import $script from 'scriptjs'
 import $ from 'jquery';
 import LuckyExcel from 'luckyexcel';
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -1593,9 +1593,9 @@ import {
   copyProductGy,
   getProductYbMaterialList,
   getProductYbInfo,
-  addProductYbInfo,
-  getAnnexTable,
-  annexAdd,
+  addProductYbInfo,
+  getAnnexTable,
+  annexAdd,
   annexDel,
 } from '@/api/yunyin/yunying'
 defineOptions({   name: 'Company'})
@@ -2466,7 +2466,7 @@ const tableRowClick = async (row) => {
   const res = await getProductData({product_code:_product_code.value});
   yjtableData.splice(0, yjtableData.length, ...res.data.yjData);
   gytableData.splice(0, gytableData.length, ...res.data.gyData);
-  ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
+  ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
   jstableData.splice(0, jstableData.length, ...res.data.jsData);
   if(yjtableData.length==0){
 	   yjzuidahaoma.value = 1
@@ -3304,297 +3304,297 @@ const tableDataCellClass = ({row, column, rowIndex, columnIndex}) =>{
   if (column.property === 'gyData' || column.property === 'yjData') {
     return 'plan-usage-low';
   }
-}
-
+}
+
 //点击技术附件按钮
 const jsfjClick = () => {
 	if(_Gd_gdbh.value == null){
 	  cgugdlist.value = false;
 	  ElMessage({type: 'warning',message: '请选择具体的工单后,再操作此功能'})
 	}else{
-	  initJsfjformdata();
+	  initJsfjformdata();
 	  jsfjformdata.value.关联产品 = _Gd_gdbh.value
 	  jsfjdialogFormVisible.value = true
 	}
-}
-//技术附件弹窗
-const jsfjdialogFormVisible = ref(false)
-const jsfjformdata = ref({
-	sys_id: '[272/超级用户]',
-	序号: '',
-	附件备注: '',
-	附件内容: '',
-	附件类型: '',
-	适用工序: '',
+}
+//技术附件弹窗
+const jsfjdialogFormVisible = ref(false)
+const jsfjformdata = ref({
+	sys_id: '[272/超级用户]',
+	序号: '',
+	附件备注: '',
+	附件内容: '',
+	附件类型: '',
+	适用工序: '',
 	关联产品: '',
-});
+});
 //技术附件弹窗取消
 const initJsfjformdata = () => {
-  jsfjformdata.value = {
-	sys_id: '[272/超级用户]',
-	序号: '',
-	附件备注: '',
-	附件内容: '',
-	附件类型: '',
-	适用工序: '',
-	关联产品: '',
-  }
-}
+  jsfjformdata.value = {
+	sys_id: '[272/超级用户]',
+	序号: '',
+	附件备注: '',
+	附件内容: '',
+	附件类型: '',
+	适用工序: '',
+	关联产品: '',
+  }
+}
 //技术附件弹窗取消
 const jsfjcloseDialog = () => {
   jsfjdialogFormVisible.value = false
-}
-const uploadExcel = (event) =>{
-	const files = event.target.files;
-	let suffixArr = name.split("."), suffix = suffixArr[suffixArr.length-1];
-	// if(suffix!="xlsx"){
-	// 	alert("Currently only supports the import of xlsx files");
-	// 	return;
-	// }
-	jsfjformdata.value.附件内容 = files[0]
-	jsfjformdata.value.附件类型 = 'XLSX'
-}
-
-const yulan = (event) =>{
-	if(!jsfjformdata.value.附件内容) return
-	$.getScript('/luckysheet/plugins/js/plugin.js', () => {
-			$script('/luckysheet/luckysheet.umd.js', () => {
-			luckyexcelVisible.value = true
-			LuckyExcel.transformExcelToLucky(jsfjformdata.value.附件内容, 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'));
-	
-}
-const jsfj_del = (row) =>{
-	ElMessageBox.confirm('确定要删除吗?', '提示', {
-	    confirmButtonText: '确定',
-	    cancelButtonText: '取消',
-	    type: 'warning'
-	}).then(() => {
-		annexDel({'UniqId':row.UniqId,'cpdh':_Gd_gdbh.value}).then(response => {
-			 if(response.code==0){
-				 ElMessage({
-				   type: 'success',
-				   message: '删除成功',
-				 })
-				 let row = {
-					 'UniqID':_UniqID.value,
-					 '产品编号':_product_code.value,
-					 '产品名称':_kehu_code.value,
-				 }
-				 tableRowClick (row)
-			  }
-		   })
-	})
-	
-}
-
-//技术附件弹窗确定
-const jsfjenterDialog = () => {
-	if(jsfjformdata.value.序号==''){
-		ElMessage({
-			type: 'error',
-			message: '请填写序号'
-		});
-		return;
-	}
-	if(jsfjformdata.value.附件备注==''){
-		ElMessage({
-			type: 'error',
-			message: '请填写附件备注'
-		});
-		return;
-	}
-	if(jsfjformdata.value.附件内容==''){
-		ElMessage({
-			type: 'error',
-			message: '请上传文件'
-		});
-		return;
-	}
-	if(jsfjformdata.value.适用工序==''){
-		ElMessage({
-			type: 'error',
-			message: '请填写适用工序'
-		});
-		return;
-	}
-	if(jsfjformdata.value.关联产品==''){
-		ElMessage({
-			type: 'error',
-			message: '请填写关联产品'
-		});
-		return;
-	}
-	
-	let fr = new FileReader();
-	fr.readAsDataURL(jsfjformdata.value.附件内容);
-	fr.onload = function () {
-	  const restoredData = new FormData();
-	  restoredData.append('sys_id', jsfjformdata.value.sys_id);
-	  restoredData.append('序号', jsfjformdata.value.序号);
-	  restoredData.append('附件备注', jsfjformdata.value.附件备注);
-	  restoredData.append('附件内容', fr.result);
-	  restoredData.append('附件类型', jsfjformdata.value.附件类型);
-	  restoredData.append('适用工序', jsfjformdata.value.适用工序);
-	  restoredData.append('关联产品', jsfjformdata.value.关联产品);
-			
-	   annexAdd(restoredData).then(response => {
-		 if(response.code==0){
-			 ElMessage({
-			   type: 'success',
-			   message: '新增成功',
-			 })
-			 jsfjdialogFormVisible.value = false
-			 let row = {
-				 'UniqID':_UniqID.value,
-				 '产品编号':_product_code.value,
-				 '产品名称':_kehu_code.value,
-			 }
-			 tableRowClick (row)
-		 }
-	   })
-	}
-}
-
-//技术资料excel展示
-const ExcelShow = (row) =>{
-	if(!row.附件内容) return
-	$.getScript('/luckysheet/plugins/js/plugin.js', () => {
-		$script('/luckysheet/luckysheet.umd.js', () => {
-					console.log(row.附件内容)
-					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'));
-	
-}
-
-let luckyExcel = null
-
-const luckyexcelVisible = ref(false)
+}
+const uploadExcel = (event) =>{
+	const files = event.target.files;
+	let suffixArr = name.split("."), suffix = suffixArr[suffixArr.length-1];
+	// if(suffix!="xlsx"){
+	// 	alert("Currently only supports the import of xlsx files");
+	// 	return;
+	// }
+	jsfjformdata.value.附件内容 = files[0]
+	jsfjformdata.value.附件类型 = 'XLSX'
+}
+
+const yulan = (event) =>{
+	if(!jsfjformdata.value.附件内容) return
+	$.getScript('/luckysheet/plugins/js/plugin.js', () => {
+			$script('/luckysheet/luckysheet.umd.js', () => {
+			luckyexcelVisible.value = true
+			LuckyExcel.transformExcelToLucky(jsfjformdata.value.附件内容, 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'));
+
+}
+const jsfj_del = (row) =>{
+	ElMessageBox.confirm('确定要删除吗?', '提示', {
+	    confirmButtonText: '确定',
+	    cancelButtonText: '取消',
+	    type: 'warning'
+	}).then(() => {
+		annexDel({'UniqId':row.UniqId,'cpdh':_Gd_gdbh.value}).then(response => {
+			 if(response.code==0){
+				 ElMessage({
+				   type: 'success',
+				   message: '删除成功',
+				 })
+				 let row = {
+					 'UniqID':_UniqID.value,
+					 '产品编号':_product_code.value,
+					 '产品名称':_kehu_code.value,
+				 }
+				 tableRowClick (row)
+			  }
+		   })
+	})
+
+}
+
+//技术附件弹窗确定
+const jsfjenterDialog = () => {
+	if(jsfjformdata.value.序号==''){
+		ElMessage({
+			type: 'error',
+			message: '请填写序号'
+		});
+		return;
+	}
+	if(jsfjformdata.value.附件备注==''){
+		ElMessage({
+			type: 'error',
+			message: '请填写附件备注'
+		});
+		return;
+	}
+	if(jsfjformdata.value.附件内容==''){
+		ElMessage({
+			type: 'error',
+			message: '请上传文件'
+		});
+		return;
+	}
+	if(jsfjformdata.value.适用工序==''){
+		ElMessage({
+			type: 'error',
+			message: '请填写适用工序'
+		});
+		return;
+	}
+	if(jsfjformdata.value.关联产品==''){
+		ElMessage({
+			type: 'error',
+			message: '请填写关联产品'
+		});
+		return;
+	}
+
+	let fr = new FileReader();
+	fr.readAsDataURL(jsfjformdata.value.附件内容);
+	fr.onload = function () {
+	  const restoredData = new FormData();
+	  restoredData.append('sys_id', jsfjformdata.value.sys_id);
+	  restoredData.append('序号', jsfjformdata.value.序号);
+	  restoredData.append('附件备注', jsfjformdata.value.附件备注);
+	  restoredData.append('附件内容', fr.result);
+	  restoredData.append('附件类型', jsfjformdata.value.附件类型);
+	  restoredData.append('适用工序', jsfjformdata.value.适用工序);
+	  restoredData.append('关联产品', jsfjformdata.value.关联产品);
+
+	   annexAdd(restoredData).then(response => {
+		 if(response.code==0){
+			 ElMessage({
+			   type: 'success',
+			   message: '新增成功',
+			 })
+			 jsfjdialogFormVisible.value = false
+			 let row = {
+				 'UniqID':_UniqID.value,
+				 '产品编号':_product_code.value,
+				 '产品名称':_kehu_code.value,
+			 }
+			 tableRowClick (row)
+		 }
+	   })
+	}
+}
+
+//技术资料excel展示
+const ExcelShow = (row) =>{
+	if(!row.附件内容) return
+	$.getScript('/luckysheet/plugins/js/plugin.js', () => {
+		$script('/luckysheet/luckysheet.umd.js', () => {
+					console.log(row.附件内容)
+					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'));
+
+}
+
+let luckyExcel = null
+
+const luckyexcelVisible = ref(false)
 const luckyexcelCloseDialog = () => {
   luckyexcelVisible.value = false
-}
+}
 /**
  * 只读版luckyExcel 创建
  */
-const createROLuckyExcel = (files) => {
-	LuckyExcel.transformExcelToLucky(files, 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();
-			nextTick(() => {
-				$(function () {
-					luckysheet.create({
-						container: 'luckyexcel', //容器的ID
-						data: exportJson.sheets,
-						title: exportJson.info.name, // 工作簿名称
-						lang: "zh", // 设定表格语言 国际化设置,允许设置表格的语言,支持中文("zh")和英文("en")
-						// allowCopy: false, // 是否允许拷贝
-						showtoolbar: false, // 是否显示工具栏
-						showinfobar: false, // 是否显示顶部信息栏
-						// showsheetbar: false, // 是否显示底部sheet页按钮
-						// showstatisticBar: false, // 是否显示底部计数栏
-						// sheetBottomConfig: false, // sheet页下方的添加行按钮和回到顶部按钮配置
-						allowEdit: false, // 是否允许前台编辑
-						enableAddRow: false, // 允许增加行
-						enableAddCol: false, // 允许增加列
-						userInfo: false, // 右上角的用户信息展示样式
-						showRowBar: false, // 是否显示行号区域
-						showColumnBar: false, // 是否显示列号区域
-						sheetFormulaBar: false, // 是否显示公式栏
-						enableAddBackTop: false,//返回头部按钮
-						// rowHeaderWidth: 0,//纵坐标
-						// columnHeaderHeight: 0,//横坐标
-						// showstatisticBarConfig: {
-						// count:false,
-						// view:false,
-						// zoom:false,
-						// },
-						// showsheetbarConfig: {
-						// add: false, //新增sheet
-						// menu: false, //sheet管理菜单
-						// sheet: false, //sheet页显示
-						// },
-						// hook: {
-						// cellMousedown:this.cellMousedown,//绑定鼠标事件
-						// },
-						// forceCalculation: true,//强制计算公式
-					});
-					luckyExcel = luckysheet;
-				});
-			});
-		
+const createROLuckyExcel = (files) => {
+	LuckyExcel.transformExcelToLucky(files, 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();
+			nextTick(() => {
+				$(function () {
+					luckysheet.create({
+						container: 'luckyexcel', //容器的ID
+						data: exportJson.sheets,
+						title: exportJson.info.name, // 工作簿名称
+						lang: "zh", // 设定表格语言 国际化设置,允许设置表格的语言,支持中文("zh")和英文("en")
+						// allowCopy: false, // 是否允许拷贝
+						showtoolbar: false, // 是否显示工具栏
+						showinfobar: false, // 是否显示顶部信息栏
+						// showsheetbar: false, // 是否显示底部sheet页按钮
+						// showstatisticBar: false, // 是否显示底部计数栏
+						// sheetBottomConfig: false, // sheet页下方的添加行按钮和回到顶部按钮配置
+						allowEdit: false, // 是否允许前台编辑
+						enableAddRow: false, // 允许增加行
+						enableAddCol: false, // 允许增加列
+						userInfo: false, // 右上角的用户信息展示样式
+						showRowBar: false, // 是否显示行号区域
+						showColumnBar: false, // 是否显示列号区域
+						sheetFormulaBar: false, // 是否显示公式栏
+						enableAddBackTop: false,//返回头部按钮
+						// rowHeaderWidth: 0,//纵坐标
+						// columnHeaderHeight: 0,//横坐标
+						// showstatisticBarConfig: {
+						// count:false,
+						// view:false,
+						// zoom:false,
+						// },
+						// showsheetbarConfig: {
+						// add: false, //新增sheet
+						// menu: false, //sheet管理菜单
+						// sheet: false, //sheet页显示
+						// },
+						// hook: {
+						// cellMousedown:this.cellMousedown,//绑定鼠标事件
+						// },
+						// forceCalculation: true,//强制计算公式
+					});
+					luckyExcel = luckysheet;
+				});
+			});
+
 	})
 }
 </script>

+ 177 - 177
src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -257,7 +257,7 @@
                         @selection-change="handleSelectionChange" :show-overflow-tooltip="true">
 
                 <template v-for="item in tableFields[currentNode]">
-                  <el-table-column :align="item.align" :label="item.title"  :prop="item.prop" :width="item.width" />
+                  <el-table-column :align="item.align" :label="item.title"  :prop="item.prop" :width="item.width" :sortable="item.sortable"  />
                 </template>
               </el-table>
               <!-- 分页 -->
@@ -280,20 +280,20 @@
                           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                           :header-cell-style="{ padding: '0px' }" highlight-current-row="true"
                           style="width: 100%;height: 42vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
-                  <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="500"/>
-                  <el-table-column align="left"  label="工序备注" prop="工序备注"  width="150"/>
-                  <el-table-column align="left"  label="机组" prop="机组"  width="80"/>
-                  <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="70"/>
-                  <el-table-column align="left"  label="创建用户" prop="创建用户"  width="100"/>
-                  <el-table-column align="left"  label="创建时间" prop="创建时间"  width="110"/>
-                  <el-table-column align="left"  label="修改时间" prop="修改时间"  width="110"/>
-                  <el-table-column align="left"  label="UNIQID" prop="UNIQID"  width="90"/>
+                  <el-table-column align="left" sortable label="工单编号" prop="工单编号"  width="110"/>
+                  <el-table-column align="left" sortable label="重点工序" prop="重点工序"  width="110"/>
+                  <el-table-column align="left" sortable label="印件工序及名称" prop="印件工序及名称"  width="500"/>
+                  <el-table-column align="left" sortable label="工序备注" prop="工序备注"  width="150"/>
+                  <el-table-column align="left" sortable label="机组" prop="机组"  width="110"/>
+                  <el-table-column align="left" sortable label="小时产能" prop="小时产能"  width="110"/>
+                  <el-table-column align="left" sortable label="生产工时" prop="生产工时"  width="110"/>
+                  <el-table-column align="left" sortable label="辅助工时" prop="辅助工时"  width="110"/>
+                  <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="110"/>
+                  <el-table-column align="left" sortable label="创建时间" prop="创建时间"  width="110"/>
+                  <el-table-column align="left" sortable label="修改时间" prop="修改时间"  width="110"/>
+                  <el-table-column align="left" sortable label="UNIQID" prop="UNIQID"  width="110"/>
                 </el-table>
               </el-tab-pane>
 
@@ -303,22 +303,22 @@
                           :header-cell-style="{ padding: '0px' }" :show-overflow-tooltip="true"
                           :highlight-current-row="true"
                           style="width: 100%;height: 42vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
-                  <el-table-column align="left"  label="工单编号" prop="工单编号"  width="90"/>
-                  <el-table-column align="left"  label="印件号" prop="印件号"  width="70"/>
-                  <el-table-column align="left"  label="印件代号" prop="印件代号"  width="100"/>
-                  <el-table-column align="left"  label="印件名称" prop="印件名称"  width="240"/>
-                  <el-table-column align="left"  label="纸张名称" prop="纸张名称"  width="230"/>
-                  <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="90"/>
-                  <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="70"/>
-                  <el-table-column align="left"  label="开数" prop="开数"  width="70"/>
-                  <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="110"/>
-                  <el-table-column align="left"  label="UNIQID" prop="UNIQID"  width="90"/>
+                  <el-table-column align="left" sortable label="工单编号" prop="工单编号"  width="110"/>
+                  <el-table-column align="left" sortable label="印件号" prop="印件号"  width="110"/>
+                  <el-table-column align="left" sortable label="印件代号" prop="印件代号"  width="110"/>
+                  <el-table-column align="left" sortable label="印件名称" prop="印件名称"  width="240"/>
+                  <el-table-column align="left" sortable label="纸张名称" prop="纸张名称"  width="230"/>
+                  <el-table-column align="left" sortable label="投料规格" prop="投料规格"  width="110"/>
+                  <el-table-column align="left" sortable label="成品数量" prop="成品数量"  width="110"/>
+                  <el-table-column align="left" sortable label="实际投料" prop="实际投料"  width="110"/>
+                  <el-table-column align="left" sortable label="投料单位" prop="投料单位"  width="110"/>
+                  <el-table-column align="left" sortable label="平张投料" prop="平张投料"  width="110"/>
+                  <el-table-column align="left" sortable label="联数" prop="联数"  width="110"/>
+                  <el-table-column align="left" sortable label="开数" prop="开数"  width="110"/>
+                  <el-table-column align="left" sortable label="创建用户" prop="创建用户"  width="110"/>
+                  <el-table-column align="left" sortable label="创建时间" prop="创建时间"  width="110"/>
+                  <el-table-column align="left" sortable label="修改时间" prop="修改时间"  width="110"/>
+                  <el-table-column align="left" sortable label="UNIQID" prop="UNIQID"  width="110"/>
                 </el-table>
               </el-tab-pane>
             </el-tabs>
@@ -332,7 +332,7 @@
                         :cell-class-name="pczc_planUsageCellClass"
                         style="width: 100%;height: 42vh" border tooltip-effect="dark" :data="bottomData" row-key="ID" @selection-change="handleSelectionChange">
                 <template v-for="item in bottomTableF[currentNode]">
-                  <el-table-column :align="item.align" :label="item.title"  :prop="item.prop" :width="item.width" />
+                  <el-table-column :align="item.align" :label="item.title"  :prop="item.prop" :width="item.width" :sortable="item.sortable" />
                 </template>
               </el-table>
             </div>
@@ -347,25 +347,25 @@
                 <!-- 排程列表-->
                 <el-table-column type="selection" width="30" />
                 <template v-for="item in [
-                  { align:'left', title: '工单编号', prop: '工单编号', width: 85  },
-                  { align:'left', title: '销售订单号', prop: '销售订单号', width: 200  },
-                  { align:'left', title: '印件名称', prop: '印件名称', width: 320  },
-                  { align:'left', title: '印件工序及名称', prop: '印件工序及名称', width: 200  },
-                  { align:'left', title: '工序产量', prop: '工序产量', width: 90  },
-                  { align:'left', title: '已完成产量', prop: '已完成产量', width: 100  },
-                  { align:'left', title: '产品名称', prop: '产品名称', width: 320  },
-                  { align:'left', title: '订单数量', prop: '订单数量', width: 120  },
-                  { align:'left', title: '计量单位', prop: '计量单位', width: 120  },
-                  { align:'left', title: '交货日期', prop: '交货日期', width: 115  },
-                  { align:'left', title: '产品代号', prop: '产品代号', width: 140  },
-                  { align:'left', title: '工序名称', prop: '工序名称', width: 120  },
-                  { align:'left', title: '机组', prop: '机组', width: 90  },
-                  { align:'left', title: '设备编号', prop: '设备编号', width: 90  },
-                  { align:'left', title: 'GYUID', prop: 'GYUID', width: 90  },
-                  { align:'left', title: '印件号', prop: 'yjno', width: 90  },
-                  { align:'left', title: '工序号', prop: 'gxh', width: 90  },
+                  { align:'left', title: '工单编号', prop: '工单编号', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '销售订单号', prop: '销售订单号', width: 200  , sortable: 'sortable', },
+                  { align:'left', title: '印件名称', prop: '印件名称', width: 320  , sortable: 'sortable', },
+                  { align:'left', title: '印件工序及名称', prop: '印件工序及名称', width: 200  , sortable: 'sortable', },
+                  { align:'left', title: '工序产量', prop: '工序产量', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '已完成产量', prop: '已完成产量', width: 120  , sortable: 'sortable', },
+                  { align:'left', title: '产品名称', prop: '产品名称', width: 320  , sortable: 'sortable', },
+                  { align:'left', title: '订单数量', prop: '订单数量', width: 120  , sortable: 'sortable', },
+                  { align:'left', title: '计量单位', prop: '计量单位', width: 120  , sortable: 'sortable', },
+                  { align:'left', title: '交货日期', prop: '交货日期', width: 115  , sortable: 'sortable', },
+                  { align:'left', title: '产品代号', prop: '产品代号', width: 140  , sortable: 'sortable', },
+                  { align:'left', title: '工序名称', prop: '工序名称', width: 120  , sortable: 'sortable', },
+                  { align:'left', title: '机组', prop: '机组', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '设备编号', prop: '设备编号', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: 'GYUID', prop: 'GYUID', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '印件号', prop: 'yjno', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '工序号', prop: 'gxh', width: 110  , sortable: 'sortable', },
               ]">
-                  <el-table-column :align="item.align" :label="item.title" :prop="item.prop" :width="item.width" />
+                  <el-table-column :align="item.align" :label="item.title" :prop="item.prop" :width="item.width" :sortable="item.sortable" />
                 </template>
               </el-table>
               <!-- 制程列表-->
@@ -376,35 +376,35 @@
                         style="width: 100%;height: 49vh;margin-top: 10px" border tooltip-effect="dark" :data="chejianfuData" row-key="ID" @selection-change="ZP_handleChange">
                 <el-table-column type="selection" width="30" />
                 <template v-for="item in [
-                  { align:'left', title: '工单编号', prop: '工单编号', width: 85  },
-                  { align:'left', title: '销售订单号', prop: '销售订单号', width: 200  },
-                  { align:'left', title: '印件名称', prop: '印件名称', width: 320  },
-                  { align:'left', title: '印件工序及名称', prop: '印件工序及名称', width: 200  },
-                  { align:'left', title: '工序产量', prop: '工序产量', width: 90  },
-                  { align:'left', title: '已完成产量', prop: '已完成产量', width: 100  },
-                  { align:'left', title: '小时产能', prop: '小时产能', width: 90  },
-                  { align:'left', title: '产能系数', prop: '产能系数', width: 90  },
-                  { align:'left', title: '生产工时', prop: '生产工时', width: 90  },
-                  { align:'left', title: '辅助工时', prop: '辅助工时', width: 90  },
-                  { align:'left', title: '最早开工时间', prop: '最早开工时间', width: 160  },
-                  { align:'left', title: '计划开工时间', prop: '计划开工时间', width: 160  },
-                  { align:'left', title: '计划完工时间', prop: '计划完工时间', width: 160  },
-                  { align:'left', title: '班次安排', prop: '班次安排', width: 90  },
-                  { align:'left', title: '排单备注', prop: '排单备注', width: 120  },
-                  { align:'left', title: '产品名称', prop: '产品名称', width: 180  },
-                  { align:'left', title: '订单数量', prop: '订单数量', width: 120  },
-                  { align:'left', title: '计量单位', prop: '计量单位', width: 120  },
-                  { align:'left', title: '交货日期', prop: '交货日期', width: 115  },
-                  { align:'left', title: '优先次序', prop: '优先次序', width: 90  },
-                  { align:'left', title: '产品代号', prop: '产品代号', width: 100  },
-                  { align:'left', title: '工序名称', prop: '工序名称', width: 120  },
-                  { align:'left', title: '设备编号', prop: '设备编号', width: 90  },
-                  { align:'left', title: '车间名称', prop: '车间名称', width: 90  },
-                  { align:'left', title: 'GYUID', prop: 'GYUID', width: 90  },
-                  { align:'left', title: '印件号', prop: 'yjno', width: 90  },
-                  { align:'left', title: '工序号', prop: 'gxh', width: 90  },
+                  { align:'left', title: '工单编号', prop: '工单编号', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '销售订单号', prop: '销售订单号', width: 200  , sortable: 'sortable', },
+                  { align:'left', title: '印件名称', prop: '印件名称', width: 320  , sortable: 'sortable', },
+                  { align:'left', title: '印件工序及名称', prop: '印件工序及名称', width: 200  , sortable: 'sortable', },
+                  { align:'left', title: '工序产量', prop: '工序产量', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '已完成产量', prop: '已完成产量', width: 120  , sortable: 'sortable', },
+                  { align:'left', title: '小时产能', prop: '小时产能', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '产能系数', prop: '产能系数', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '生产工时', prop: '生产工时', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '辅助工时', prop: '辅助工时', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '最早开工时间', prop: '最早开工时间', width: 160  , sortable: 'sortable', },
+                  { align:'left', title: '计划开工时间', prop: '计划开工时间', width: 160  , sortable: 'sortable', },
+                  { align:'left', title: '计划完工时间', prop: '计划完工时间', width: 160  , sortable: 'sortable', },
+                  { align:'left', title: '班次安排', prop: '班次安排', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '排单备注', prop: '排单备注', width: 120  , sortable: 'sortable', },
+                  { align:'left', title: '产品名称', prop: '产品名称', width: 180  , sortable: 'sortable', },
+                  { align:'left', title: '订单数量', prop: '订单数量', width: 120  , sortable: 'sortable', },
+                  { align:'left', title: '计量单位', prop: '计量单位', width: 120  , sortable: 'sortable', },
+                  { align:'left', title: '交货日期', prop: '交货日期', width: 115  , sortable: 'sortable', },
+                  { align:'left', title: '优先次序', prop: '优先次序', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '产品代号', prop: '产品代号', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '工序名称', prop: '工序名称', width: 120  , sortable: 'sortable', },
+                  { align:'left', title: '设备编号', prop: '设备编号', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '车间名称', prop: '车间名称', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: 'GYUID', prop: 'GYUID', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '印件号', prop: 'yjno', width: 110  , sortable: 'sortable', },
+                  { align:'left', title: '工序号', prop: 'gxh', width: 110  , sortable: 'sortable', },
               ]">
-                  <el-table-column :align="item.align" :label="item.title" :prop="item.prop" :width="item.width" />
+                  <el-table-column :align="item.align" :label="item.title" :prop="item.prop" :width="item.width" :sortable="item.sortable" />
                 </template>
               </el-table>
             </div>
@@ -496,119 +496,119 @@ const sctreeData = ref([
 //上方表格
 const tableFields = ref({
   "计划中": [
-    { title:'获取状态', prop: 'statusColumn', width: 80, align:'center'},
-    { title:'生产分类', prop: '生产分类', width: 80, align:'left', },
-    { title: '工单编号', prop: '工单编号', width: 80, align:'center', },
-    { title: '产品代号', prop: '产品代号', width: 90, align:'center', },
-    { title: '产品名称', prop: '产品名称', width: 280, align:'left', },
-    { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
-    { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
-    { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
-    { title: '计量单位', prop: '计量单位', width: 80, align:'center', },
-    { title: '客户名称', prop: '客户名称', width: 200, align:'left', },
-    { title: '客户编号', prop: '客户编号', width: 80, align:'center', },
-    { title: '备注', prop: '备注', width: 230, align:'left', },
-    { title: '客户料号', prop: '客户料号', width: 120, align:'left', },
-    { title: '创建用户', prop: '创建用户', width: 110, align:'left', },
-    { title: '创建时间', prop: '创建时间', width: 110, align:'left', },
-    { title: '修改时间', prop: '修改时间', width: 110, align:'left', },
-    { title: 'UNIQID', prop: 'UNIQID', width: 80  , align:'left', },
-    { title: '投料率', prop: '投料率', width: 100, align:'left', },
-    { title: '销售订单号', prop: '销售订单号', width: 120, align:'left', },
+    { title:'获取状态', prop: 'statusColumn', width: 100, align:'center',sortable: 'sortable', },
+    { title:'生产分类', prop: '生产分类', width: 100, align:'left',sortable: 'sortable', },
+    { title: '工单编号', prop: '工单编号', width: 100, align:'center', sortable: 'sortable', },
+    { title: '产品代号', prop: '产品代号', width: 100, align:'center', sortable: 'sortable', },
+    { title: '产品名称', prop: '产品名称', width: 280, align:'left', sortable: 'sortable', },
+    { title: '接单日期', prop: '接单日期', width: 110, align:'left', sortable: 'sortable', },
+    { title: '交货日期', prop: '交货日期', width: 110, align:'left', sortable: 'sortable', },
+    { title: '订单数量', prop: '订单数量', width: 100, align:'left', sortable: 'sortable', },
+    { title: '计量单位', prop: '计量单位', width: 100, align:'center', sortable: 'sortable', },
+    { title: '客户名称', prop: '客户名称', width: 200, align:'left', sortable: 'sortable', },
+    { title: '客户编号', prop: '客户编号', width: 100, align:'center', sortable: 'sortable', },
+    { title: '备注', prop: '备注', width: 230, align:'left', sortable: 'sortable', },
+    { title: '客户料号', prop: '客户料号', width: 120, align:'left', sortable: 'sortable', },
+    { title: '创建用户', prop: '创建用户', width: 110, align:'left', sortable: 'sortable', },
+    { title: '创建时间', prop: '创建时间', width: 110, align:'left', sortable: 'sortable', },
+    { title: '修改时间', prop: '修改时间', width: 110, align:'left', sortable: 'sortable', },
+    { title: 'UNIQID', prop: 'UNIQID', width: 100  , align:'left', sortable: 'sortable', },
+    { title: '投料率', prop: '投料率', width: 100, align:'left', sortable: 'sortable', },
+    { title: '销售订单号', prop: '销售订单号', width: 120, align:'left', sortable: 'sortable', },
   ],
   "排程中": [
     // { title: '最早开工时间', prop: '最早开工时间', width: 120, align:'left', },
-    { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
-    { title: '产品代号', prop: '产品代号', width: 90, align:'left', },
-    { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
-    { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
-    { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
-    { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
-    { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
-    { title: '销售订单号', prop: '销售订单号', width: 200, align:'left', },
-    // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
-    { title: '客户编号', prop: '客户编号', width: 120, align:'left', },
-    { title: '客户名称', prop: '客户名称', width: 230, align:'left', },
-    { title: '创建用户', prop: '创建用户', width: 120, align:'left', },
-    // { title: 'GDUID', prop: 'GDUID', width: 120, align:'left', },
-    { title: 'GYUID', prop: 'GYUID', width: 100, align:'left', },
+    { title: '工单编号', prop: '工单编号', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '产品代号', prop: '产品代号', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '产品名称', prop: '产品名称', width: 340, align:'left',  sortable: 'sortable', },
+    { title: '接单日期', prop: '接单日期', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '交货日期', prop: '交货日期', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '订单数量', prop: '订单数量', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '计量单位', prop: '计量单位', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '销售订单号', prop: '销售订单号', width: 200, align:'left',  sortable: 'sortable', },
+    // { title: '排程类型', prop: '排程类型', width: 120, align:'left',  sortable: 'sortable', },
+    { title: '客户编号', prop: '客户编号', width: 120, align:'left',  sortable: 'sortable', },
+    { title: '客户名称', prop: '客户名称', width: 230, align:'left',  sortable: 'sortable', },
+    { title: '创建用户', prop: '创建用户', width: 120, align:'left',  sortable: 'sortable', },
+    // { title: 'GDUID', prop: 'GDUID', width: 120, align:'left',  sortable: 'sortable', },
+    { title: 'GYUID', prop: 'GYUID', width: 100, align:'left',  sortable: 'sortable', },
   ],
   "制程中": [
-    // { title: '最早开工时间', prop: '最早开工时间', width: 120, align:'left', },
-    { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
-    { title: '产品代号', prop: '产品代号', width: 90, align:'left', },
-    { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
-    { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
-    { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
-    { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
-    { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
-    { title: '销售订单号', prop: '销售订单号', width: 200, align:'left', },
-    // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
-    { title: '客户编号', prop: '客户编号', width: 120, align:'left', },
-    { title: '客户名称', prop: '客户名称', width: 120, align:'left', },
-    { title: '客户料号', prop: '客户料号', width: 160, align:'left', },
-    // { title: 'GDUID', prop: 'GDUID', width: 120, align:'left', },
-    { title: 'GYUID', prop: 'GYUID', width: 100, align:'left', },
+    // { title: '最早开工时间', prop: '最早开工时间', width: 120, align:'left',  sortable: 'sortable', },
+    { title: '工单编号', prop: '工单编号', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '产品代号', prop: '产品代号', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '产品名称', prop: '产品名称', width: 340, align:'left',  sortable: 'sortable', },
+    { title: '接单日期', prop: '接单日期', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '交货日期', prop: '交货日期', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '订单数量', prop: '订单数量', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '计量单位', prop: '计量单位', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '销售订单号', prop: '销售订单号', width: 200, align:'left',  sortable: 'sortable', },
+    // { title: '排程类型', prop: '排程类型', width: 120, align:'left',  sortable: 'sortable', },
+    { title: '客户编号', prop: '客户编号', width: 120, align:'left',  sortable: 'sortable', },
+    { title: '客户名称', prop: '客户名称', width: 120, align:'left',  sortable: 'sortable', },
+    { title: '客户料号', prop: '客户料号', width: 160, align:'left',  sortable: 'sortable', },
+    // { title: 'GDUID', prop: 'GDUID', width: 120, align:'left',  sortable: 'sortable', },
+    { title: 'GYUID', prop: 'GYUID', width: 100, align:'left',  sortable: 'sortable', },
   ],
   "已完工": [
-    { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
-    { title: '产品代号', prop: '产品代号', width: 110, align:'left', },
-    { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
-    { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
-    { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
-    { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
-    { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
-    { title: '销售订单号', prop: '销售订单号', width: 120, align:'left', },
-    { title: '客户编号', prop: '客户编号', width: 80, align:'left', },
-    { title: '客户名称', prop: '客户名称', width: 120, align:'left', },
-    { title: '客户料号', prop: '客户料号', width: 120, align:'left', },
-    // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
-    { title: 'GDUID', prop: 'GDUID', width: 80, align:'left', },
+    { title: '工单编号', prop: '工单编号', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '产品代号', prop: '产品代号', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '产品名称', prop: '产品名称', width: 340, align:'left',  sortable: 'sortable', },
+    { title: '接单日期', prop: '接单日期', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '交货日期', prop: '交货日期', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '订单数量', prop: '订单数量', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '计量单位', prop: '计量单位', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '销售订单号', prop: '销售订单号', width: 120, align:'left',  sortable: 'sortable', },
+    { title: '客户编号', prop: '客户编号', width: 110, align:'left',  sortable: 'sortable', },
+    { title: '客户名称', prop: '客户名称', width: 120, align:'left',  sortable: 'sortable', },
+    { title: '客户料号', prop: '客户料号', width: 120, align:'left',  sortable: 'sortable', },
+    // { title: '排程类型', prop: '排程类型', width: 120, align:'left',  sortable: 'sortable', },
+    { title: 'GDUID', prop: 'GDUID', width: 110, align:'left',  sortable: 'sortable', },
   ]
 })
 //排程中、制程中下方表格列表
 const bottomTableF = ref({
   "排程中": [
-    { title:'工单编号', prop: '工单编号', width: 90, align:'left', },
-    { title:'印件工序及名称', prop: '印件工序及名称', width: 160, align:'left', },
-    { title:'机组', prop: '机组', width: 120, align:'left', },
-    { title:'设备编号', prop: '设备编号', width: 120, align:'left', },
-    { title:'工序产量', prop: '工序产量', width: 120, align:'left', },
-    { title:'已完成产量', prop: '产量', width: 120, align:'left', },
-    { title:'剩余产量', prop: '剩余产量', width: 120, align:'left', },
-    { title:'小时产能', prop: '小时产能', width: 120, align:'left', },
-    { title:'产能系数', prop: '产能系数', width: 120, align:'left', },
-    { title:'生产工时', prop: '生产工时', width: 120, align:'left', },
-    { title:'辅助工时', prop: '辅助工时', width: 120, align:'left', },
-    { title:'最早开工时间', prop: '最早开工时间', width: 120, align:'left', },
-    { title:'计划开工时间', prop: '计划开工时间', width: 120, align:'left', },
-    { title:'计划完工时间', prop: '计划完工时间', width: 120, align:'left', },
-    { title:'班次安排', prop: '班次安排', width: 120, align:'left', },
-    { title:'设备名称', prop: '设备名称', width: 120, align:'left', },
-    { title:'排单备注', prop: '排单备注', width: 120, align:'left', },
-    { title:'工序完工', prop: '工序完工', width: 160, align:'left', },
-    { title:'UNIQID', prop: 'UNIQID', width: 120, align:'left', },
+    { title:'工单编号', prop: '工单编号', width: 110, align:'left',  sortable: 'sortable', },
+    { title:'印件工序及名称', prop: '印件工序及名称', width: 160, align:'left',  sortable: 'sortable', },
+    { title:'机组', prop: '机组', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'设备编号', prop: '设备编号', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'工序产量', prop: '工序产量', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'已完成产量', prop: '产量', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'剩余产量', prop: '剩余产量', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'小时产能', prop: '小时产能', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'产能系数', prop: '产能系数', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'生产工时', prop: '生产工时', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'辅助工时', prop: '辅助工时', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'最早开工时间', prop: '最早开工时间', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'计划开工时间', prop: '计划开工时间', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'计划完工时间', prop: '计划完工时间', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'班次安排', prop: '班次安排', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'设备名称', prop: '设备名称', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'排单备注', prop: '排单备注', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'工序完工', prop: '工序完工', width: 160, align:'left',  sortable: 'sortable', },
+    { title:'UNIQID', prop: 'UNIQID', width: 120, align:'left',  sortable: 'sortable', },
   ],
   "制程中": [
-    { title:'工单编号', prop: '工单编号', width: 90, align:'left', },
-    { title:'印件工序及名称', prop: '印件工序及名称', width: 160, align:'left', },
-    { title:'机组', prop: '机组', width: 120, align:'left', },
-    { title:'设备编号', prop: '设备编号', width: 120, align:'left', },
-    { title:'工序产量', prop: '工序产量', width: 120, align:'left', },
-    { title:'已完成产量', prop: '产量', width: 120, align:'left', },
-    { title:'剩余产量', prop: '剩余产量', width: 120, align:'left', },
-    { title:'小时产能', prop: '小时产能', width: 120, align:'left', },
-    { title:'产能系数', prop: '产能系数', width: 120, align:'left', },
-    { title:'生产工时', prop: '生产工时', width: 120, align:'left', },
-    { title:'辅助工时', prop: '辅助工时', width: 120, align:'left', },
-    { title:'最早开工时间', prop: '最早开工时间', width: 120, align:'left', },
-    { title:'计划开工时间', prop: '计划开工时间', width: 120, align:'left', },
-    { title:'计划完工时间', prop: '计划完工时间', width: 120, align:'left', },
-    { title:'班次安排', prop: '班次安排', width: 120, align:'left', },
-    { title:'设备名称', prop: '设备名称', width: 120, align:'left', },
-    { title:'排单备注', prop: '排单备注', width: 120, align:'left', },
-    { title:'工序完工', prop: '工序完工', width: 160, align:'left', },
-    { title:'UNIQID', prop: 'UNIQID', width: 120, align:'left', },
+    { title:'工单编号', prop: '工单编号', width: 110, align:'left',  sortable: 'sortable', },
+    { title:'印件工序及名称', prop: '印件工序及名称', width: 160, align:'left',  sortable: 'sortable', },
+    { title:'机组', prop: '机组', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'设备编号', prop: '设备编号', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'工序产量', prop: '工序产量', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'已完成产量', prop: '产量', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'剩余产量', prop: '剩余产量', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'小时产能', prop: '小时产能', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'产能系数', prop: '产能系数', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'生产工时', prop: '生产工时', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'辅助工时', prop: '辅助工时', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'最早开工时间', prop: '最早开工时间', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'计划开工时间', prop: '计划开工时间', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'计划完工时间', prop: '计划完工时间', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'班次安排', prop: '班次安排', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'设备名称', prop: '设备名称', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'排单备注', prop: '排单备注', width: 120, align:'left',  sortable: 'sortable', },
+    { title:'工序完工', prop: '工序完工', width: 160, align:'left',  sortable: 'sortable', },
+    { title:'UNIQID', prop: 'UNIQID', width: 120, align:'left',  sortable: 'sortable', },
   ],
 })
 //左侧左边栏

+ 31 - 31
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -435,25 +435,25 @@
                         :show-overflow-tooltip="true">
 <!--                <el-table-column align="center" type="selection" width="30"/>-->
                 <el-table-column align="left" label="获取状态"   prop="status"  width="81" />
-                <el-table-column align="left" label="工单编号"   prop="工单编号"  width="81" />
-                <el-table-column align="left" label="生产分类"   prop="生产分类" width="81" />
-                <el-table-column align="left" label="销售订单号" prop="销售订单号" width="100" />
-                <el-table-column align="left" label="产品代号"   prop="产品代号"  width="99" />
-                <el-table-column align="left" label="产品名称"   prop="产品名称" width="370" />
-                <el-table-column align="left" label="订单数量"   prop="订单数量" width="100" />
-                <el-table-column align="left" label="单位"       prop="单位"   width="54"/>
-                <el-table-column align="left" label="折合大箱"   prop="折合大箱" width="81" />
-                <el-table-column align="left" label="投料率"     prop="投料率" width="80" />
-                <el-table-column align="left" label="平均合格率"  prop="平均合格率" width="95" />
-                <el-table-column align="left" label="开单日期"    prop="开单日期" width="98" />
-                <el-table-column align="left" label="交货日期"    prop="交货日期" width="98" />
-                <el-table-column align="left" label="工单类型"    prop="工单类型" width="98" />
-                <el-table-column align="left" label="工单状态"    prop="工单状态" width="85" />
-                <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="130" />
-                <el-table-column align="left" label="建档时间"    prop="建档时间" width="115" />
-                <el-table-column align="left" label="更新时间"    prop="更新时间" width="160" />
+                <el-table-column align="left" sortable label="工单编号"   prop="工单编号"  width="110" />
+                <el-table-column align="left" sortable label="生产分类"   prop="生产分类" width="110" />
+                <el-table-column align="left" sortable label="销售订单号" prop="销售订单号" width="120" />
+                <el-table-column align="left" sortable label="产品代号"   prop="产品代号"  width="110" />
+                <el-table-column align="left" sortable label="产品名称"   prop="产品名称" width="370" />
+                <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="110" />
+                <el-table-column align="left" sortable label="投料率"     prop="投料率" width="110" />
+                <el-table-column align="left" sortable label="平均合格率"  prop="平均合格率" width="120" />
+                <el-table-column align="left" sortable label="开单日期"    prop="开单日期" width="110" />
+                <el-table-column align="left" sortable label="交货日期"    prop="交货日期" width="110" />
+                <el-table-column align="left" sortable label="工单类型"    prop="工单类型" width="110" />
+                <el-table-column align="left" sortable label="工单状态"    prop="工单状态" width="110" />
+                <el-table-column align="left" sortable label="当前生产工序" prop="当前生产工序" width="140" />
+                <el-table-column align="left" sortable label="产量提交时间" prop="产量提交时间" width="140" />
+                <el-table-column align="left" sortable label="建档用户"    prop="建档用户" width="130" />
+                <el-table-column align="left" sortable label="建档时间"    prop="建档时间" width="115" />
+                <el-table-column align="left" sortable label="更新时间"    prop="更新时间" width="160" />
               </el-table>
               <!-- 分页 -->
               <div class="gva-pagination">
@@ -481,18 +481,18 @@
                           @selection-change="selectionChange($event, '印件资料')"
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID">
                   <el-table-column type="selection" width="30" />
-                  <el-table-column align="left" label="印件号" prop="印件号"  width="70"/>
-                  <el-table-column align="left" label="印件代号" prop="印件代号"  width="98"/>
-                  <el-table-column align="left" label="印件名称" prop="印件名称"  width="340"/>
-                  <el-table-column align="left" label="纸张代号" prop="纸张代号"  width="98"/>
-                  <el-table-column align="left" label="纸张名称" prop="纸张名称"  width="340"/>
-                  <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="100"/>
-                  <el-table-column align="left" label="建档时间" prop="建档时间"  width="160"/>
-                  <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
+                  <el-table-column align="left" sortable label="印件号" prop="印件号"  width="100"/>
+                  <el-table-column align="left" sortable label="印件代号" prop="印件代号"  width="110"/>
+                  <el-table-column align="left" sortable label="印件名称" prop="印件名称"  width="340"/>
+                  <el-table-column align="left" sortable label="纸张代号" prop="纸张代号"  width="110"/>
+                  <el-table-column align="left" sortable label="纸张名称" prop="纸张名称"  width="340"/>
+                  <el-table-column align="left" sortable label="投料规格" prop="投料规格"  width="110"/>
+                  <el-table-column align="left" sortable label="平张投料" prop="平张投料"  width="110"/>
+                  <el-table-column align="left" sortable label="开料规格" prop="开料规格"  width="110"/>
+                  <el-table-column align="left" sortable label="开数*联数" prop="开数*联数"  width="120"/>
+                  <el-table-column align="left" sortable label="建档用户" prop="建档用户"  width="110"/>
+                  <el-table-column align="left" sortable label="建档时间" prop="建档时间"  width="160"/>
+                  <el-table-column align="left" sortable label="更新时间" prop="更新时间"  width="160"/>
                 </el-table>
               </el-tab-pane>