Merge branch 'master' of https://git.7in6.com/dacheng/mes-dacheng-admin-backend-ui

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -147,43 +147,61 @@
                           @row-dblclick="gdbomupdateCompanyFunc"
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="ddtableData" row-key="ID"
 						   @selection-change="fjSelectionChange">
-                 <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
-                 <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
-                 <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
-                 <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
-                 <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
-				 <el-table-column align="left" label="操作"width="100"fixed="right">
-				   <template #default="scope">
-				     <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
-				   </template>
-				 </el-table-column>
+                  <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
+				  <el-table-column align="left" label="附件备注" 	prop="附件备注"  width="110"/>
+				  <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
+				  <el-table-column align="left" label="版本号" prop="version"  width="80"/>
+				  <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="updatetime"  width="160"/>
+				<!-- 操作列，新增修改和删除按钮 -->
+				<el-table-column align="left" label="操作" width="230" fixed="right">
+				  <template #default="scope">
+				    <!-- PDF预览按钮 -->
+				    <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)">PDF预览</el-button>
+				    <!-- 删除按钮 -->
+				    <el-button type="danger" size="small" @click="deleteItem(scope.row)">删除</el-button>
+				  </template>
+				</el-table-column>
                 </el-table>
               </el-tab-pane> 
 			  
               
 
-			  <el-tab-pane label="技术附件"  name="fourth">
-			  	<el-table ref="multipleTable"
-					  :row-style="{ height: '30px' }"
-					  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '30px' }"
-					  :header-cell-style="{ padding: '0px' }"
-					  :show-overflow-tooltip="true"
-					  :cell-class-name="planUsageCellClass"
-					  highlight-current-row="true"
-					  @row-dblclick="ExcelShow"
-					  style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="fjSelectionChange">
-				  <el-table-column align="left" label="关联编号" prop="关联编号"  width="115"/>
-				  <el-table-column align="left" label="备注" 	prop="附件备注"  width="110"/>
-				  <el-table-column align="left" label="文件类型" prop="附件类型"  width="100"/>
-				  <el-table-column align="left" label="建档时间" prop="sys_rq"  width="160"/>
-				  <el-table-column align="left" label="建档用户" prop="sys_id"  width="200"/>
-				  <el-table-column align="left" label="操作"width="100"fixed="right">
-				    <template #default="scope">
-				      <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)" >PDF预览</el-button> 
-				    </template>
-				  </el-table-column>
-			      </el-table>
-			    </el-tab-pane>
+			  <el-tab-pane label="技术附件" name="fourth">
+			    <el-table ref="multipleTable"
+			      :row-style="{ height: '30px' }"
+			      :cell-style="{ padding: '0px' }"
+			      :header-row-style="{ height: '30px' }"
+			      :header-cell-style="{ padding: '0px' }"
+			      :show-overflow-tooltip="true"
+			      :cell-class-name="planUsageCellClass"
+			      highlight-current-row="true"
+			      @row-dblclick="ExcelShow"
+			      style="width: 100%;height: 36vh"
+			      border tooltip-effect="dark"
+			      :data="jstableData"
+			      row-key="ID"
+			      @selection-change="fjSelectionChange">
+			  
+			      <el-table-column align="left" label="关联编号" prop="关联编号" width="115"/>
+			      <el-table-column align="left" label="附件备注" prop="附件备注" width="110"/>
+			      <el-table-column align="left" label="文件类型" prop="附件类型" width="100"/>
+			      <el-table-column align="left" label="版本号" prop="version" width="80"/>
+			      <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="操作" width="230" fixed="right">
+			        <template #default="scope">
+			          <!-- PDF预览按钮 -->
+			          <el-button type="success" size="small" :data="ddtableData" @click="showPdf(scope.row)">PDF预览</el-button>
+			          <!-- 删除按钮 -->
+			          <el-button type="danger" size="small" @click="deleteItem(scope.row)">删除</el-button>
+			        </template>
+			      </el-table-column>
+			    </el-table>
+			  </el-tab-pane>
 
           <el-tab-pane label="BOM资料"  name="six">
                 <el-table ref="multipleTable"
@@ -197,19 +215,20 @@
 						  @selection-change="bomSelectionChange"
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID">
                  <!-- <el-table-column type="selection" width="30" /> -->
-                  <el-table-column align="left" label="订单编号" prop="订单编号"  width="110"/>
+                  <el-table-column align="left" label="订单编号" prop="订单编号"  width="105"/>
+				  <el-table-column align="left" label="面料分类" prop="BOM_desc"  width="100"/>
 				  <!-- <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="90"/> -->
-                  <el-table-column align="left" label="物料名称" prop="物料名称"  width="200"/>
+                  <el-table-column align="left" label="物料名称" prop="物料名称"  width="210"/>
                   <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="110"/>
-				  <el-table-column align="left" label="单位" prop="投料单位"  width="60"/>
 				  <el-table-column align="left" label="备注" prop="备注"  width="180"/>
-				  <el-table-column align="left" label="更新用户" prop="ID"  width="130"/>
+				  <el-table-column align="left" label="单位" prop="投料单位"  width="60"/>
+				  <el-table-column align="left" label="更新用户" prop="ID"  width="110"/>
 				  <el-table-column align="left" label="更新日期" prop="日期"  width="160"/>
 				  <!-- <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="80"/> -->
                 </el-table>
@@ -1126,9 +1145,9 @@
       </div>
     </template>
         </el-dialog>
-
-        <!-- 技术附件 -->
-        <el-dialog v-model="jsfjdialogFormVisible" :before-close="jsfjcloseDialog" :title="产品技术附件资料" 
+		
+        <!-- 附件上传 -->
+        <el-dialog v-model="jsfjdialogFormVisible" :before-close="jsfjcloseDialog"
 					style="margin-top: 40px" height="500px" width="700px" destroy-on-close>
 			  <el-form :model="jsfjformdata" label-position="right" ref="elFormRef" :rules="rule" label-width="90px">
 				<el-row :gutter="24">
@@ -1253,7 +1272,8 @@ import * as XLSX from 'xlsx';
 import jsPDF from 'jspdf';
 import {Datalist,WorkOrderList,WorkOrderAdd,PrintListData,
 printDetailAdd,PrintDetailDel,orderDataDel,getWorkOrder,
-getSuborder,PrintDataEdit,WorkOrderEdit,gdAnnexAdd,upload,OrderAttachments,getPonumber,FabricEdit,orderBomList,FabricDetail,fabricList,Bomdel} from '@/api/mes/job'
+getSuborder,PrintDataEdit,WorkOrderEdit,gdAnnexAdd,upload,OrderAttachments,
+getPonumber,FabricEdit,orderBomList,FabricDetail,fabricList,Bomdel} from '@/api/mes/job'
 import PrintPage from './components/print.vue'
 import luckyexcelPage from './components/luckyexcel.vue'
 import AddGongYi from './components/addGongYi.vue'  
@@ -1435,6 +1455,30 @@ const handleNodeClick = async (node) => {
 	_WorkList_page();
 };
 
+// 删除
+const deleteItem = async (row) => {
+	console.log(row)
+	ElMessageBox.confirm('确定删除此行数据吗？', '提示', {
+	    confirmButtonText: '确定',
+	    cancelButtonText: '取消',
+	    type: 'warning'
+	}).then(async () => {
+	 //    const delfujian_del = await delfujian({UniqId:row['UniqId']});
+		// if(delfujian_del.code === 0){
+		// 	ElMessage({type: 'success',message: '删除成功'})
+		// }else{
+		// 	ElMessage({type: 'error',message: '删除失败'})
+		// }
+		// tableRowClick (row)
+	}).catch(() => {
+	    // 取消删除
+	    ElMessage({
+	        type: 'info',
+	        message: '已取消删除'
+	    });
+	});
+}
+
 
 const showPdf = async (row) => {
 	luckyexcelPageRef.value.open(row)
@@ -2538,8 +2582,6 @@ const add_bomenterDialog = async() => {
 	  resbomtableData.value.push(newRow);
 }
 
-
-
 // BOM删除
 const record_deleteRow = async (row, index) => {
     console.log(row.UNIQID);

src/view/yunyin/shengchanguanli/yangyipihe.vue

@@ -41,17 +41,24 @@
 						<el-table-column   align="center" label="技术附件状态" prop="status"  width="110" />
 						<el-table-column   align="center" label="订单附件状态" prop="orderstatus"  width="110" />
 						<el-table-column   align="left" label="客户" prop="客户编号"  width="70" />
-						<el-table-column   align="left" label="订单编号" prop="订单编号"  width="120" />
+						<el-table-column   align="left" label="订单编号" prop="订单编号"  width="115" />
 						<el-table-column   align="left" label="生产款号" prop="生产款号"  width="150" />
 						<el-table-column   align="left" label="款式" prop="款式"  width="110" />
-						<el-table-column   align="left" label="工单状态" prop="gd_statu"  width="90" />
+		               <el-table-column align="left" label="工单状态" prop="gd_statu" width="120" sortable>
+						  <template #default="{ row }">
+							<el-tag :type="row.gd_statu === '1-计划中' ? 'success' : (row.gd_statu === '2-生产中' ? 'info' : 'danger')">
+							  {{ row.gd_statu === '1-计划中' ? '计划中' : (row.gd_statu === '2-生产中' ? '生产中' : '已完工') }}
+							</el-tag>
+						  </template>
+						</el-table-column>
 						<el-table-column   align="left" label="订单数量" prop="订单数量"  width="90" />
 						<el-table-column   align="left" label="包装完工数量" prop="工单完工数量"  width="110" />
 						<el-table-column   align="left" label="单位" prop="单位"  width="60" />
-						<el-table-column   align="left" label="船样合计" prop="船样合计"  width="90" />
-						<el-table-column   align="left" label="船样描述" prop="船样描述"  width="200" />
+						<el-table-column   align="left" label="面料" prop="面料"  width="360" />
 						<el-table-column   align="left" label="粘衬" prop="粘衬"  width="360" />
 						<el-table-column   align="left" label="要求" prop="要求"  width="360" />
+						<el-table-column   align="left" label="船样合计" prop="船样合计"  width="90" />
+						<el-table-column   align="left" label="船样描述" prop="船样描述"  width="200" />
 						<el-table-column   align="left" label="箱唛要求" prop="箱唛要求"  width="360" />
 						<el-table-column   align="left" label="工单完工日期" prop="工单完工日期"  width="140" />
 						<el-table-column   align="left" label="制单人" prop="Sys_id"  width="160" />