优化

src/api/mes/job.js

@@ -817,6 +817,16 @@ export const delfujian = (data) => {
   })
 }
 
+//订单状态更新
+export const Apigdstatus = (data) => {
+  return service({
+    url: '/mes_server/Facility/Apigdstatus',
+    method: 'post',
+    data
+  })
+}
+
+
 //面料退还报工
 export const TuihuoReport = (data) => {
   return service({

src/view/material/technological.vue

@@ -1,8 +1,112 @@
 <template>
+<!-- 右侧内容区域 -->
+<layout-content >
+          <el-main>
+            <el-tabs v-model="activeName" @tab-click="handleClick">
+			  <el-tab-pane label="技术附件" name="first">
+			    <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: 72vh"
+			      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>
+			          <!-- 删除按钮 -->
+			        </template>
+			      </el-table-column>
+			    </el-table>
+			  </el-tab-pane>
+              <!-- 分页 -->
+					<div class="gva-pagination">
+						<el-pagination
+							@size-change="handleSizeChange"
+							@current-change="handleCurrentChange"
+							:current-page="page"
+							:page-sizes="[10, 30, 50, 100]"
+							:page-size="pageSize"
+							layout="total, sizes, prev, pager, next, jumper"
+							:total="total">
+						</el-pagination>
+					</div>
+            </el-tabs>
+        </el-main>
+    </layout-content>
+	<luckyexcelPage ref="luckyexcelPageRef" />
 </template>
 
 <script>
+//点击按钮显示下方表格
+export default {
+  data() {
+    return {
+      currentTable: '', // 当前展示的表格
+      activeName: 'first',
+      _ddhval:'',
+	   size: '',
+	  add_gddialogFormVisible: true,
+    };
+  }
+};
 </script>
+<script setup> 
+import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
+import { ElMessage, ElMessageBox,ElUpload, ElButton,ElLoading } from 'element-plus'
+import { ref, reactive, computed, nextTick, watch,onMounted,onBeforeUnmount } from 'vue'
+import {OrderAttachments} from '@/api/mes/job'
+import axios from 'axios';
+import luckyexcelPage from '@/view/yunyin/shengchanguanli/components/luckyexcel.vue'
+const luckyexcelPageRef = ref()
+// 分页相关的响应式变量
+const page = ref(1)
+  const total = ref(0)
+  const pageSize = ref(50)
 
-<style>
-</style>
+//获取表格数据
+const jstableData = reactive([])
+
+const getjsfjtable = async () => {
+	const jsOrderAttachments = await OrderAttachments({order:'',desc:'',page:page.value,limit:pageSize.value})
+    if (jsOrderAttachments.code === 0) {
+        console.log(jsOrderAttachments.data.list.length)
+        jstableData.splice(0,jsOrderAttachments.data.list.length,...jsOrderAttachments.data.list);
+        total.value = jsOrderAttachments.data.total;
+    }
+}
+getjsfjtable();
+const showPdf = async (row) => {
+	luckyexcelPageRef.value.open(row)
+};
+
+
+  // 分页
+  const handleCurrentChange = (val) => {
+	page.value = val;
+	getjsfjtable();
+  };
+  
+  // 修改页面容量 点击多少条/页
+  const handleSizeChange = (val) => {
+	pageSize.value = val;
+	getjsfjtable();
+  };
+</script>

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -52,24 +52,24 @@
 						@row-click="tableRowClick" @row-dblclick="updateCompanyFunc"
                         @selection-change="ddzlSelectionChange" :show-overflow-tooltip="true">
                 <el-table-column align="center" type="selection" width="40"/>
-				<el-table-column align="center"  label="附件状态"     	prop="status" 	width="100" />
+				<el-table-column align="center"  label="附件"     	prop="status" 	width="60" />
                 <el-table-column align="left" sortable label="订单编号"     	prop="订单编号" 	width="110" />
 				<el-table-column align="left"  label="客户"      	prop="客户编号" 		width="80" />
-                <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"  label="订单数量"    	prop="订单数量" 	width="100" />
-				<el-table-column align="left" label="工单状态" prop="gd_statu" width="100" >
+                <el-table-column align="left"  label="款号"   	prop="生产款号"  width="110" />
+                <el-table-column align="left"  label="款式"       	prop="款式"   	width="100"/>
+				<el-table-column align="left"  label="数量"    	prop="订单数量" 	width="60" />
+				<el-table-column align="left" label="状态" prop="gd_statu" width="65" >
 					<template #default="{ row }">
 						<el-tag :type="row.gd_statu === '1-计划中' ? 'warning' : (row.gd_statu === '2-生产中' ? 'success' : 'info')">
 							{{ row.gd_statu === '1-计划中' ? '计划中' : (row.gd_statu === '2-生产中' ? '生产中' : '已完工') }}
 						</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column align="left" sortable label="落货日期"   	prop="落货日期" 	width="120" />
-				<el-table-column align="left"  label="船样合计"    	prop="船样合计" 	width="90" />
-				<el-table-column align="left"  label="船样描述"    	prop="船样描述" 	width="140" />
+				<el-table-column align="left"  label="落货日期"   	prop="落货日期" 	width="120" />
+				<el-table-column align="left"  label="船样"    	prop="船样合计" 	width="60" />
+				<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="230" />
+                <el-table-column align="left"  label="面料"       	prop="面料" 		width="180" />
                 <el-table-column align="left"  label="备注"       	prop="要求" 		width="130" />
                 <el-table-column align="left"  label="粘衬"        	prop="粘衬"		width="80" />
 				<el-table-column align="left"  label="箱唛要求"   	prop="箱唛要求" 	width="110" />

src/view/yunyin/shengchanguanli/yangyipihe.vue

@@ -9,6 +9,7 @@
 				<el-input v-model="searchInfo" placeholder="模糊搜索订单编号或者生产款号" @keyup.enter="onSubmit()"  style="width: 220px;"></el-input>
 				<el-button type="primary" icon="search" @click="onSubmit" >查询</el-button>
 				<el-button type="primary" icon="edit"   @click="hptg_onClick" :disabled="table_Selection === false"  class="bt" title="核批通过">核批通过</el-button>
+				<el-button type="primary" icon="edit"   @click="ztgg_onClick" :disabled="table_Selection === false"  class="bt" title="状态更改">状态更改</el-button>
 			  </el-form-item>
 				<el-tag type="warning" style="font-size: 12px;">
 					<span>附件状态带有 “ </span>
@@ -44,7 +45,7 @@
 						<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="100" >
+						<el-table-column align="left" label="工单状态" prop="gd_statu" width="100" >
 							<template #default="{ row }">
 							<el-tag :type="row.gd_statu === '1-计划中' ? 'warning' : (row.gd_statu === '2-生产中' ? 'success' : 'info')">
 							{{ row.gd_statu === '1-计划中' ? '计划中' : (row.gd_statu === '2-生产中' ? '生产中' : '已完工') }}
@@ -86,7 +87,22 @@
 					</div>
             </el-tabs>
 			</div>
-  
+				<!-- 状态更改弹窗 -->
+				<el-dialog v-model="dialogVisible" title="状态更改">
+				<el-radio-group v-model="selectedStatus" >
+					<el-radio 
+					v-for="item in statusOptions"
+					:key="item.value"
+					:label="item.value"
+					>
+					{{ item.label }}
+					</el-radio>
+				</el-radio-group>
+				<template #footer>
+					<el-button @click="dialogVisible = false">取消</el-button>
+					<el-button type="primary" @click="handleStatusConfirm">确认</el-button>
+				</template>
+				</el-dialog>
 		  <!-- </el-main> -->
 		</layout-content>
 		</layout>
@@ -113,7 +129,7 @@
   // 全量引入格式化工具 请按需保留
   import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
   import {ref, reactive} from 'vue'
-  import {UnapprovalList,Approval} from '@/api/mes/job'
+  import {UnapprovalList,Approval,Apigdstatus} from '@/api/mes/job'
   import {jcgetTab,workOrderDetail,getOrderProcessCount,PrintDetailList} from '@/api/yunyin/yunying'
   import PrintPage from './components/print.vue'
   import {ElMessage} from "element-plus";
@@ -348,7 +364,35 @@ const hptg_onClick = async () => {
 	}
 };
 
- 
+const dialogVisible = ref(false);
+const selectedStatus = ref('');
+const statusOptions = [
+  { value: 'plan', label: '1-计划中' },
+  { value: 'production', label: '2-生产中' },
+  { value: 'complete', label: '3-已完工' }
+];
+
+const handleStatusConfirm = async () => {
+  if (!selectedStatus.value) {
+    ElMessage.warning('请选择状态');
+    return;
+  }
+  // 在这里处理状态更改逻辑，例如发送请求到后端
+  const res = await Apigdstatus({ Uniqid: _Uniqid.value, gd_statu: selectedStatus.value });
+  if (res.code === 0) {
+	ElMessage.success(`已更改为：${selectedStatus.value}`);
+	dialogVisible.value = false;
+	onSubmit();
+  }else{
+  	ElMessage.error('更改失败');	
+  }
+};
+
+//状态更改按钮
+const ztgg_onClick = async () => {
+	console.log(_Uniqid.value)
+	dialogVisible.value = true;
+}