侧边栏，新增

src/api/jixiaoguanli/jitairibaobiao.js

@@ -702,6 +702,14 @@ export const  facilitySpotCheckItem= (params) => {
 	params
   })
 }
+//客诉记录
+export const  ComplaintRecord= (params) => {
+  return service({
+    url:'/mes_server/facility/ComplaintRecord',
+    method: 'get',
+	params
+  })
+}
 //关联工资核算
 //设备点检->左侧菜单栏
 export const  relatedTab= (params) => {

src/view/performance/09-workOrderVerification/index.vue

@@ -3,7 +3,7 @@
     <el-container>
       <!-- 左侧树形结构 -->
       <el-scrollbar max-height="75vh">
-        <el-aside>
+        <!-- <el-aside>
           <div class="JKWTree-tree">
             <h3>工单核验单维护</h3>
             <el-tree
@@ -12,7 +12,25 @@
               @node-click="handleNodeClick"
             />
           </div>
-        </el-aside>
+        </el-aside> -->
+		
+		<layout-sider
+		   :resize-directions="['right']"
+		   :width="220"
+		   style="margin-right: 50px;"
+		 >
+		   <div
+		     class="JKWTree-tree"
+		     style="height: 70vh;"
+		   >
+		     <h3>工单核验单维护</h3>
+		     <el-tree
+		       :data="treeData"
+		       highlight-current
+		       @node-click="handleNodeClick"
+		     />
+		   </div>
+		 </layout-sider>
       </el-scrollbar>
 
       <el-container>
@@ -126,6 +144,7 @@
                   v-model="detailData.qczl_rq"
                   type="date"
                   style="width: 150px;"
+				  
                 />
                 <!--                <el-input
                   v-model="detailData.qczl_rq"
@@ -172,7 +191,7 @@
                 <el-input
                   v-model="detailData.yj_yjmc"
                   style="width: 500px;"
-                  readonly
+                  
                 />
               </el-form-item>
               <el-form-item
@@ -200,7 +219,7 @@
                 <el-input
                   v-model="detailData.qczl_gxh"
                   style="width: 100px;"
-                  readonly
+                  
                 />
               </el-form-item>
               <el-form-item
@@ -209,7 +228,7 @@
                 <el-input
                   v-model="detailData.total_liucheng"
                   style="width: 100px;"
-                  readonly
+                  
                 />
               </el-form-item>
 
@@ -313,7 +332,7 @@
                     <template #default="{ row }">
                       <el-input
                         v-model="row.fp_bz"
-                        readonly
+                        
                       />
                     </template>
                   </el-table-column>
@@ -334,7 +353,7 @@
                     <template #default="{ row }">
                       <el-input
                         v-model="row.fp_name"
-                        readonly
+                        
                       />
                     </template>
                   </el-table-column>
@@ -475,7 +494,7 @@ import { getSide, getTable, getOneWorkOrder, getOrderInfo, getGxAndLeader, getYj
 import Meirihejiantongji from '@/view/performance/09-workOrderVerification/componets/meirihejiantongji.vue'
 import Gongdanzhijianfeipintongji from '@/view/performance/09-workOrderVerification/componets/gongdanzhijianfeipintongji.vue'
 import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/componets/shebeizhuangtai.vue'
-
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 defineOptions({
   name: '06PackingDocuments'
 })
@@ -820,15 +839,21 @@ const enterDialog = async() => {
 	  addDetailData()
   }
 }
-// 新增
-const addDetailData = async() => {
+const addDetailData = async () => {
+  const formatDate = (date) => {
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
+  };
+
   const restoredData = {
     UniqId: detailData.UniqId,
     qczl_gdbh: detailData.qczl_gdbh,
     qczl_yjno: detailData.qczl_yjno,
     qczl_gxh: detailData.qczl_gxh,
     qczl_gxmc: detailData.qczl_gxmc,
-    qczl_rq: detailData.qczl_rq,
+    qczl_rq: formatDate(new Date(detailData.qczl_rq)),
     qczl_fp: detailData.qczl_fp,
     qczl_num: detailData.qczl_num,
     qczl_NumDesc: detailData.qczl_NumDesc,
@@ -840,17 +865,19 @@ const addDetailData = async() => {
     qczl_NumDesc6: detailData.qczl_NumDesc6,
     qczl_NumDesc7: detailData.qczl_NumDesc7,
     qczl_NumDesc8: detailData.qczl_NumDesc8,
-    sys_id: '[1003/洪桂芬]',
-  }
+    sys_id: '[1003/洪桂芬]'
+  };
+
   detailData.table.forEach((item, index) => {
-	  const num = index + 1
-	  restoredData[`fp_lb${num}`] = item.fp_lb
-	  restoredData[`fp_sl${num}`] = item.fp_sl
-	  restoredData[`fp_bh${num}`] = item.fp_bh
-	  restoredData[`fp_bz${num}`] = item.fp_bz
-	  restoredData[`fp_gxmc${num}`] = item.fp_gxmc
-  })
-  console.log(restoredData)
+    const num = index + 1;
+    restoredData[`fp_lb${num}`] = item.fp_lb;
+    restoredData[`fp_sl${num}`] = item.fp_sl;
+    restoredData[`fp_bh${num}`] = item.fp_bh;
+    restoredData[`fp_bz${num}`] = item.fp_bz;
+    restoredData[`fp_gxmc${num}`] = item.fp_gxmc;
+  });
+
+  console.log(restoredData);
   const res = await add(restoredData)
   console.log(res)
 
@@ -861,16 +888,24 @@ const addDetailData = async() => {
     })
     dialogFormVisible.value = false
   }
-}
+};
 // 修改
 const updateDetailData = async() => {
+	
+	const formatDate = (date) => {
+	  const year = date.getFullYear();
+	  const month = String(date.getMonth() + 1).padStart(2, '0');
+	  const day = String(date.getDate()).padStart(2, '0');
+	  return `${year}-${month}-${day}`;
+	};
+	
   const restoredData = {
 	  UniqId: detailData.UniqId,
 	  qczl_gdbh: detailData.qczl_gdbh,
 	  qczl_yjno: detailData.qczl_yjno,
 	  qczl_gxh: detailData.qczl_gxh,
 	  qczl_gxmc: detailData.qczl_gxmc,
-	  qczl_rq: detailData.qczl_rq,
+	  qczl_rq: formatDate(new Date(detailData.qczl_rq)),
 	  qczl_fp: detailData.qczl_fp,
 	  qczl_num: detailData.qczl_num,
 	  qczl_NumDesc: detailData.qczl_NumDesc,

src/view/performance/Dayreportattached.vue

@@ -2,14 +2,32 @@
   <div>
     <!-- 左侧树形结构 -->
     <el-container>
-      <el-aside width="250px">
+      <!-- <el-aside width="250px">
         <div class="JKWTree-tree">
           <h3>机台生产日报表附加维护</h3>
           <el-tree :data="treeData" :props="defaultProps" highlight-current="true"
             @node-click="handleNodeClick"></el-tree>
         </div>
-      </el-aside>
-
+      </el-aside> -->
+
+      <layout-sider
+         :resize-directions="['right']"
+         :width="220"
+         style="margin-right: 10px;"
+       >
+         <div
+           class="JKWTree-tree"
+           style="height: 70vh;"
+         >
+           <h3>机台生产日报表附加维护</h3>
+           <el-tree
+             :data="treeData"
+             highlight-current
+             @node-click="handleNodeClick"
+           />
+         </div>
+		 
+       </layout-sider>
       <el-container>
         <el-main>
           <!-- 按钮区域 -->
@@ -151,7 +169,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
-
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 defineOptions({
   name: '06-packingDocuments'
 })

src/view/performance/Dayreports.vue

@@ -2,13 +2,31 @@
   <div>
     <!-- 左侧树形结构 -->
     <el-container>
-      <el-aside width="250px">
+      <!-- <el-aside width="250px">
         <div class="JKWTree-tree">
           <h3>机台生产日报表维护</h3>
           <el-tree :data="treeData" :props="defaultProps" highlight-current="true"
             @node-click="handleNodeClick"></el-tree>
         </div>
-      </el-aside>
+      </el-aside> -->
+
+       <layout-sider
+          :resize-directions="['right']"
+          :width="220"
+          style="margin-right: 10px;"
+        >
+          <div
+            class="JKWTree-tree"
+            style="height: 70vh;"
+          >
+            <h3>机台生产日报表维护</h3>
+            <el-tree
+              :data="treeData"
+              highlight-current
+              @node-click="handleNodeClick"
+            />
+          </div>
+        </layout-sider>
 
       <el-container>
         <el-main>
@@ -25,7 +43,7 @@
               </div>
             </el-form-item>
             <!-- 数据展示 -->
-            <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
+            <el-table ref="multipleTable" style="width: 100%;" tooltip-effect="dark" :data="tableData" row-key="ID"
               highlight-current-row="true" border 
 			  :row-style="{ height: '0px' }"
 			  :header-row-style="{ height: '20px' }"
@@ -53,7 +71,7 @@
 			  <el-table-column align="left" label="组员编号1" prop="sczl_bh1" width="100"/>
 			  <el-table-column align="left" label="组员姓名1" prop="name1"  width="100"/>
 			  <el-table-column align="left" label="组员编号2" prop="sczl_bh2"  width="100"/>
-			  <el-table-column align="left" label="组员姓名2" prop="name1" width="100" />
+			  <el-table-column align="left" label="组员姓名2" prop="name2" width="100" />
 			  <el-table-column align="left" label="组员编号3" prop="sczl_bh3"  width="100"/>
 			  <el-table-column align="left" label="组员姓名3" prop="name3" width="100"/>
 			  <el-table-column align="left" label="组员编号4" prop="sczl_bh4" width="100"/>
@@ -84,12 +102,18 @@
 			</tbody>
             </el-table>
             <!-- 分页 -->
-            <div class="gva-pagination">
+            <!-- <div class="gva-pagination">
               <el-pagination layout="total, sizes, prev, pager, next, jumper" v-model:current-page="page"
                 v-model:page-size="limit"
                 :page-sizes="[10, 30, 50, 100]" :total="total" @current-change="handleCurrentChange"
-                @size-change="handleSizeChange" />
-            </div>
+                @size-change="handleSizeChange"/>
+            </div> -->
+			<div class="gva-pagination">
+			  <el-pagination layout="total, sizes, prev, pager, next, jumper" v-model:current-page="page"
+			    v-model:page-size="limit"
+			    :page-sizes="[10, 30, 50, 100]" :total="total" @current-change="handleCurrentChange"
+			    @size-change="handleSizeChange" />
+			</div>
           </div>
           <!-- 弹出框 -->
           <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type === 'create' ? '新增' : '修改'"
@@ -104,7 +128,7 @@
 			     </el-col>
 			     <el-col :span="18">
 			       <el-form-item label="产品名称:" prop="perTenThousand" class="mab" label-width="150">
-					 <el-input v-model="formData.Gd_cpmc" id="产品名称" :readonly=true :clearable="true" />
+					 <el-input v-model="formData.Gd_cpmc" id="产品名称"   :clearable="true" />
 			       </el-form-item>
 			     </el-col>
 				 
@@ -117,7 +141,7 @@
 					</el-col>
 					<el-col :span="18">
 					  <el-form-item label="印件名称:" prop="perTenThousand" class="mab" label-width="150">
-					  <el-input v-model="formData.yj_yjmc" id="印件名称" :readonly=true :clearable="true" />
+					  <el-input v-model="formData.yj_yjmc" id="印件名称"   :clearable="true" />
 					  </el-form-item>
 					</el-col>
 				</el-row>
@@ -157,7 +181,7 @@
 			  <el-row :gutter="24">
 			    <el-col :span="6">
 			      <el-form-item label="墨色:" prop="flatFeed" class="mab">
-				  <el-input v-model="formData.sczl_ms" id="墨色" :readonly=true  @keydown="ent1($event)" :clearable="true" style="width: 200px;" />		  				  
+				  <el-input v-model="formData.sczl_ms" id="墨色" @keydown="ent1($event)" :clearable="true" style="width: 200px;" />		  				  
 			      </el-form-item>
 			    </el-col>
 			    <el-col :span="8">
@@ -452,8 +476,8 @@ import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDow
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, nextTick, onMounted, onBeforeMount } from 'vue'
-import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
-
+import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 defineOptions({
   name: '06-packingDocuments'
 })
@@ -662,7 +686,8 @@ const elSearchFormRef = ref()
 const tableData = reactive([])
 const detailData = reactive([])
 const total = ref(0)
-const page = ref(1)
+const page = ref(1)
+
 const limit = ref(10)
 const searchInfo = ref('')
 const params = {
@@ -697,18 +722,38 @@ const handleCurrentChange = (val) => {
       break
     default:
       break
-  }
- 
+  }
 }
 
 //定位
-const GetLocate = async () => {
+// const GetLocate = async () => {
+//   const response = await productionlocate({
+//     gdbh: params.gdbh,
+//     page: page.value.toString(), limit: limit.value.toString(),
+//   })
+//   if (response.code === 0) {
+// 	 console.log(response)
+//     const processedData = response.data.rows.map(item => {
+//       return {
+//         ...item,
+//         combinedProp: item.sczl_gdbh + '--'+item.yj_yjmc,
+//         combinedProp2: item.sczl_yjgx + '-'+item.sczl_gxmc
+//       };
+//     });
+// 	total.value = response.data.total
+//     tableData.splice(0, tableData.length, ...processedData);
+//   }
+// }
+const GetLocate = async () => {
+	console.log(params.gdbh)
+	console.log(page.value.toString())
+	console.log(limit.value.toString())
   const response = await productionlocate({
     gdbh: params.gdbh,
     page: page.value.toString(), limit: limit.value.toString(),
   })
+  console.log(response)
   if (response.code === 0) {
-	 console.log(response)
     const processedData = response.data.rows.map(item => {
       return {
         ...item,
@@ -716,7 +761,8 @@ const GetLocate = async () => {
         combinedProp2: item.sczl_yjgx + '-'+item.sczl_gxmc
       };
     });
-	  total.value = response.data.total
+	total.value = parseInt(response.data.total)
+	// limit.value=response.data.total
     tableData.splice(0, tableData.length, ...processedData);
   }
 }
@@ -846,31 +892,31 @@ const unsetColorReadonly = (id) => {
 
 
 //工单编号回车事件
-const getCPMCsubmit = () => {
-	if(formData.value.sczl_gdbh!=''){
-		productionGdmc({gdbh:formData.value.sczl_gdbh}).then(response=>{
-		  if (response.code === 0) {
-			  formData.value.Gd_cpmc = response.data.Gd_cpmc
-			  yjnoArr.value = response.data.yjno;
+// const getCPMCsubmit = () => {
+// 	if(formData.value.sczl_gdbh!=''){
+// 		productionGdmc({gdbh:formData.value.sczl_gdbh}).then(response=>{
+// 		  if (response.code === 0) {
+// 			  formData.value.Gd_cpmc = response.data.Gd_cpmc
+// 			  yjnoArr.value = response.data.yjno;
 			  
-			  document.getElementById('产品名称').style.color = 'red';
-			}else{
-				formData.value.sczl_gdbh = '';
-				formData.value.Gd_cpmc = '';
-				gxmc.value = '';
-				document.getElementById('产品名称').style.color = 'black';
-			}
-		});
-	}else{
-		ElMessage({
-		  type: 'error',
-		  message: '请注意, 工单编号输入空置, 除非有特殊需要！'
-		})
+// 			  document.getElementById('产品名称').style.color = 'red';
+// 			}else{
+// 				formData.value.sczl_gdbh = '';
+// 				formData.value.Gd_cpmc = '';
+// 				gxmc.value = '';
+// 				document.getElementById('产品名称').style.color = 'black';
+// 			}
+// 		});
+// 	}else{
+// 		ElMessage({
+// 		  type: 'error',
+// 		  message: '请注意, 工单编号输入空置, 除非有特殊需要！'
+// 		})
 		
-		gxmc.value = '';
-		document.getElementById('产品名称').style.color = 'black';
-	}
-}
+// 		gxmc.value = '';
+// 		document.getElementById('产品名称').style.color = 'black';
+// 	}
+// }
 
 //印件号数组
 const yjnoArr = ref([0])
@@ -1455,7 +1501,8 @@ const rate = (event,inputName) => {
 function onSearch() {
     params.gdbh = positionvalue.value
 	params.type = 'getLocateTable'
-	page.value = 1
+	page.value = 1
+	console.log('123')
 	GetLocate()
 }
 const ADD=ref('0')
@@ -1855,7 +1902,8 @@ function doubleClick(row, column, event) {
 }
 // 单击表格操作
 function Click(row, column, event) {
-    lastCellValue= row['UniqId'];
+    lastCellValue= row['UniqId'];
+	console.log(lastCellValue)
   // if(row['table_type']=='db_sczl'){
   // 	 dialogFormVisible.value = true
   // 	 GetInfo(table.value)
@@ -1867,7 +1915,8 @@ function Click(row, column, event) {
 const GetInfo = async (value) => {
   const response = await productionInfo({UniqId:value});
   if (response.code === 0) {
-	formData.value=response.data;
+	formData.value=response.data;
+	console.log(formData)
   }
 }
 

src/view/performance/MachineDocuments.vue

@@ -2,13 +2,32 @@
   <div>
     <!-- 左侧树形结构 -->
     <el-container>
-      <el-aside width="250px">
+      <!-- <el-aside width="250px">
         <div class="JKWTree-tree">
           <h3>机器检验计件单据维护</h3>
           <el-tree :data="treeData" :props="defaultProps" highlight-current="true"
             @node-click="handleNodeClick"></el-tree>
         </div>
-      </el-aside>
+      </el-aside> -->
+	  
+	  
+	  <layout-sider
+	     :resize-directions="['right']"
+	     :width="220"
+	     style="margin-right: 10px;"
+	   >
+	     <div
+	       class="JKWTree-tree"
+	       style="height: 70vh;"
+	     >
+	       <h3>机器检验计件单据维护</h3>
+	       <el-tree
+	         :data="treeData"
+	         highlight-current
+	         @node-click="handleNodeClick"
+	       />
+	     </div>
+	   </layout-sider>
       <el-container>
 		  
         <el-main>
@@ -452,7 +471,7 @@ import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
 import { login } from '@/api/user'
-
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 defineOptions({
   name: '06-packingDocuments'
 })

src/view/performance/Manualdocuments.vue

@@ -2,13 +2,33 @@
   <div>
     <!-- 左侧树形结构 -->
     <el-container>
-      <el-aside width="250px">
+      <!-- <el-aside width="250px">
         <div class="JKWTree-tree">
           <h3>手工检验计件单据维护</h3>
           <el-tree :data="treeData" :props="defaultProps" highlight-current="true"
             @node-click="handleNodeClick"></el-tree>
         </div>
-      </el-aside>
+      </el-aside> -->
+	  
+	  
+	  <layout-sider
+	     :resize-directions="['right']"
+	     :width="220"
+	     style="margin-right: 10px;"
+	   >
+	     <div
+	       class="JKWTree-tree"
+	       style="height: 70vh;"
+	     >
+	       <h3>手工检验计件单据维护</h3>
+	       <el-tree
+	         :data="treeData"
+	         highlight-current
+	         @node-click="handleNodeClick"
+	       />
+	     </div>
+	   </layout-sider>
+	  
 
       <el-container>
         <el-main>
@@ -93,9 +113,9 @@
                 <el-col :span="24">
                       <el-form-item label="工单编号" prop="id" class="mab">
                         <el-input v-model="formData.sczl_gdbh" id="工单编号"  @keydown="ent1($event, '每箱数', '工单编号', 'yjgx')" @blur="getGxMcsubmit" style="width: 118px; margin-right: 5px;"/>
-                        <el-input v-model="formData.sczl_yjgx" id="yjgx" :readonly=true @keydown="ent1($event, '工单编号', 'yjgx', 'gxmc')" style="width: 80px; margin-right: 5px;"/>
-                      	<el-input v-model="formData.sczl_gxmc" id="gxmc" :readonly=true @keydown="ent1($event, 'yjgx', 'gxmc', 'yjmc')" style="width: 135px; margin-right: 5px;"/>
-                      	<el-input v-model="formData.yj_yjmc" id="yjmc" :readonly=true @keydown="ent1($event, 'gxmc', 'yjmc', '产量合计')" style="width: 542px;"/>
+                        <el-input v-model="formData.sczl_yjgx" id="yjgx"  @keydown="ent1($event, '工单编号', 'yjgx', 'gxmc')" style="width: 80px; margin-right: 5px;"/>
+                      	<el-input v-model="formData.sczl_gxmc" id="gxmc"  @keydown="ent1($event, 'yjgx', 'gxmc', 'yjmc')" style="width: 135px; margin-right: 5px;"/>
+                      	<el-input v-model="formData.yj_yjmc" id="yjmc"  @keydown="ent1($event, 'gxmc', 'yjmc', '产量合计')" style="width: 542px;"/>
 					  </el-form-item>
                 </el-col>
               </el-row>
@@ -103,7 +123,7 @@
 			  <el-row :gutter="24">
 			     <el-col :span="6">
 			       <el-form-item label="产量合计" prop="id" class="mab">
-			         <el-input v-model="formData.sczl_cl" id="产量合计" :readonly=true @keydown="ent1($event, 'gxmc', '产量合计', '定额代号')" style="width: 150px;" />
+			         <el-input v-model="formData.sczl_cl" id="产量合计"  @keydown="ent1($event, 'gxmc', '产量合计', '定额代号')" style="width: 150px;" />
 			       </el-form-item>
 			     </el-col>
 			     <el-col :span="6">
@@ -170,9 +190,9 @@
 			  </el-row>
 			  <el-row :gutter="24" style="margin-bottom: 5px; margin-left: 30px;">
 					<el-input style="width: 100px; margin-right: 5px;" v-model="formData.sczl_bh1" id="bh1"  @keydown="ent1($event, '备注', 'bh1', 'name')"   @keyup.enter.native="getygsubmit($event, '1')"/>
-					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_bh1_name" id="name1"  @keydown="ent1($event, 'bh1', 'name', 'cl1')"/>
-					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_cl1" id="cl1"  @keydown="ent1($event, 'name', 'cl1', 'fp1')"   />
-					<el-input style="width: 100px; margin-right: 60px;" :readonly=true v-model="formData.sczl_fp1" id="fp1"  @keydown="ent1($event, 'cl1', 'fp1', 'bh7')"   />
+					<el-input style="width: 100px; margin-right: 5px;"  v-model="formData.sczl_bh1_name" id="name1"  @keydown="ent1($event, 'bh1', 'name', 'cl1')"/>
+					<el-input style="width: 100px; margin-right: 5px;"  v-model="formData.sczl_cl1" id="cl1"  @keydown="ent1($event, 'name', 'cl1', 'fp1')"   />
+					<el-input style="width: 100px; margin-right: 60px;"  v-model="formData.sczl_fp1" id="fp1"  @keydown="ent1($event, 'cl1', 'fp1', 'bh7')"   />
 					<el-input style="width: 100px; margin-right: 5px;" v-model="formData.sczl_bh7" id="bh7"  @keydown="ent1($event, 'fp1', 'bh7', 'name7')" @keyup.enter.native="getygsubmit($event, '7')"   />
 					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_bh7_name" id="name7"  @keydown="ent1($event, 'bh7', 'name7', 'cl7')"   />
 					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_cl7" id="cl7"  @keydown="ent1($event, 'name7', 'cl7', 'fp7')"   />
@@ -180,9 +200,9 @@
 			  </el-row>	
 			  <el-row :gutter="24" style="margin-bottom: 5px; margin-left: 30px;">
 					<el-input style="width: 100px; margin-right: 5px;" v-model="formData.sczl_bh2" id="bh2"  @keydown="ent1($event, 'fp7', 'bh2', 'name2')" @keyup.enter.native="getygsubmit($event, '2')"   />
-					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_bh2_name" id="name2"  @keydown="ent1($event, 'bh2', 'name2', 'cl2')"   />
-					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_cl2" id="cl2"  @keydown="ent1($event, 'name2', 'cl2', 'fp2')"   />
-					<el-input style="width: 100px; margin-right: 60px;" :readonly=true v-model="formData.sczl_fp2" id="fp2"  @keydown="ent1($event, 'cl2', 'fp2', 'bh8')"   />
+					<el-input style="width: 100px; margin-right: 5px;" v-model="formData.sczl_bh2_name" id="name2"  @keydown="ent1($event, 'bh2', 'name2', 'cl2')"   />
+					<el-input style="width: 100px; margin-right: 5px;"  v-model="formData.sczl_cl2" id="cl2"  @keydown="ent1($event, 'name2', 'cl2', 'fp2')"   />
+					<el-input style="width: 100px; margin-right: 60px;"  v-model="formData.sczl_fp2" id="fp2"  @keydown="ent1($event, 'cl2', 'fp2', 'bh8')"   />
 					<el-input style="width: 100px; margin-right: 5px;" v-model="formData.sczl_bh8" id="bh8"  @keydown="ent1($event, 'fp2', 'bh8', 'name8')" @keyup.enter.native="getygsubmit($event, '8')"   />
 					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_bh8_name" id="name8"  @keydown="ent1($event, 'bh8', 'name8', 'cl8')"   />
 					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_cl8" id="cl8"  @keydown="ent1($event, 'name8', 'cl8', 'fp8')"   />
@@ -190,9 +210,9 @@
 			   </el-row>
 				<el-row :gutter="24" style="margin-bottom: 5px; margin-left: 30px;">
 					<el-input style="width: 100px; margin-right: 5px;" v-model="formData.sczl_bh3" id="bh3"  @keydown="ent1($event, 'fp8', 'bh3', 'name3')" @keyup.enter.native="getygsubmit($event, '3')"   />
-					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_bh3_name" id="name3"  @keydown="ent1($event, 'bh3', 'name3', 'cl3')"   />
-					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_cl3" id="cl3"  @keydown="ent1($event, 'name3', 'cl3', 'fp3')"   />
-					<el-input style="width: 100px; margin-right: 60px;" :readonly=true v-model="formData.sczl_fp3" id="fp3"  @keydown="ent1($event, 'cl3', 'fp3', 'bh9')"   />
+					<el-input style="width: 100px; margin-right: 5px;"  v-model="formData.sczl_bh3_name" id="name3"  @keydown="ent1($event, 'bh3', 'name3', 'cl3')"   />
+					<el-input style="width: 100px; margin-right: 5px;"  v-model="formData.sczl_cl3" id="cl3"  @keydown="ent1($event, 'name3', 'cl3', 'fp3')"   />
+					<el-input style="width: 100px; margin-right: 60px;"  v-model="formData.sczl_fp3" id="fp3"  @keydown="ent1($event, 'cl3', 'fp3', 'bh9')"   />
 					<el-input style="width: 100px; margin-right: 5px;" v-model="formData.sczl_bh9" id="bh9"  @keydown="ent1($event, 'fp3', 'bh9', 'name9')" @keyup.enter.native="getygsubmit($event, '9')"   />
 					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_bh9_name" id="name9"  @keydown="ent1($event, 'bh9', 'name9', 'cl9')"   />
 					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_cl9" id="cl9"  @keydown="ent1($event, 'name9', 'cl9', 'fp9')"   />
@@ -200,9 +220,9 @@
 				</el-row>
 				<el-row :gutter="24" style="margin-bottom: 5px; margin-left: 30px;">
 					<el-input style="width: 100px; margin-right: 5px;" v-model="formData.sczl_bh4" id="bh4"  @keydown="ent1($event, 'fp9', 'bh4', 'name4')" @keyup.enter.native="getygsubmit($event, '4')"   />
-					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_bh4_name" id="name4"  @keydown="ent1($event, 'bh4', 'name4', 'cl4')"   />
-					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_cl4" id="cl4"  @keydown="ent1($event, 'name4', 'cl4', 'fp4')"   />
-					<el-input style="width: 100px; margin-right: 60px;" :readonly=true v-model="formData.sczl_fp4" id="fp4"  @keydown="ent1($event, 'cl4', 'fp4', 'bh10')"   />
+					<el-input style="width: 100px; margin-right: 5px;"  v-model="formData.sczl_bh4_name" id="name4"  @keydown="ent1($event, 'bh4', 'name4', 'cl4')"   />
+					<el-input style="width: 100px; margin-right: 5px;"  v-model="formData.sczl_cl4" id="cl4"  @keydown="ent1($event, 'name4', 'cl4', 'fp4')"   />
+					<el-input style="width: 100px; margin-right: 60px;"  v-model="formData.sczl_fp4" id="fp4"  @keydown="ent1($event, 'cl4', 'fp4', 'bh10')"   />
 					<el-input style="width: 100px; margin-right: 5px;" v-model="formData.sczl_bh10" id="bh10"  @keydown="ent1($event, 'fp4', 'bh10', 'name10')" @keyup.enter.native="getygsubmit($event, '10')"   />
 					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_bh10_name" id="name10"  @keydown="ent1($event, 'bh10', 'name10', 'cl10')"   />
 					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_cl10" id="cl10"  @keydown="ent1($event, 'name10', 'cl10', 'fp10')"   />
@@ -210,9 +230,9 @@
 				</el-row>
 				<el-row :gutter="24" style="margin-bottom: 5px; margin-left: 30px;">
 					<el-input style="width: 100px; margin-right: 5px;" v-model="formData.sczl_bh5" id="bh5"  @keydown="ent1($event, 'fp10', 'bh5', 'name5')" @keyup.enter.native="getygsubmit($event, '5')"   />
-					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_bh5_name" id="name5"  @keydown="ent1($event, 'bh5', 'name5', 'cl5')"    />
-					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_cl5" id="cl5"  @keydown="ent1($event, 'name5', 'cl5', 'fp5')"   />
-					<el-input style="width: 100px; margin-right: 60px;" :readonly=true v-model="formData.sczl_fp5" id="fp5"  @keydown="ent1($event, 'cl5', 'fp5', 'bh11')"   />
+					<el-input style="width: 100px; margin-right: 5px;"  v-model="formData.sczl_bh5_name" id="name5"  @keydown="ent1($event, 'bh5', 'name5', 'cl5')"    />
+					<el-input style="width: 100px; margin-right: 5px;"  v-model="formData.sczl_cl5" id="cl5"  @keydown="ent1($event, 'name5', 'cl5', 'fp5')"   />
+					<el-input style="width: 100px; margin-right: 60px;"  v-model="formData.sczl_fp5" id="fp5"  @keydown="ent1($event, 'cl5', 'fp5', 'bh11')"   />
 					<el-input style="width: 100px; margin-right: 5px;" v-model="formData.sczl_bh11" id="bh11"  @keydown="ent1($event, 'fp5', 'bh11', 'name11')" @keyup.enter.native="getygsubmit($event, '11')"   />
 					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_bh11_name" id="name11"  @keydown="ent1($event, 'bh11', 'name11', 'cl11')"   />
 					<el-input style="width: 100px; margin-right: 5px;" :readonly=true v-model="formData.sczl_cl11" id="cl11"  @keydown="ent1($event, 'name11', 'cl11', 'fp11')"   />
@@ -331,7 +351,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, nextTick, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
-
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 defineOptions({
   name: '06-packingDocuments'
 })
@@ -752,6 +772,7 @@ const getygsubmit = async (event, inputName) => {
 	let value = eval('formData.value.' + combinedString);
 	if(value){
 		const response = await getYg({sczl_bh:value});
+		console.log(response)
 		if (response.code === 0) {
 			let Bname = 'sczl_bh' + inputName+'_name';
 			formData.value[Bname]=response.data.ygxm;
@@ -762,40 +783,40 @@ const getygsubmit = async (event, inputName) => {
 }
 
 //工单编号失去焦点事件
-const getGxMcsubmit = async() => {
-	if(!formData.value.sczl_gdbh){
-		return false
-	}
-	if(GetDedhVisible.value){
-		return false
-	}
-  const response = await shougonggetGxMc({gdbh:formData.value.sczl_gdbh});
+// const getGxMcsubmit = async() => {
+// 	if(!formData.value.sczl_gdbh){
+// 		return false
+// 	}
+// 	if(GetDedhVisible.value){
+// 		return false
+// 	}
+//   const response = await shougonggetGxMc({gdbh:formData.value.sczl_gdbh});
  
-  if (response.code === 0) {
-	  if(response.data.length==0){
-		  ElMessage({
-		    type: 'error',
-		    message: '查无此编号的工单，请仔细检查后重新输入'
-		  })
-		  //设置输入框的值为空
-		  formData.value.sczl_gdbh = ''
-		  formData.value.sczl_yjgx = ''
-		  formData.value.sczl_gxmc = ''
-		  formData.value.yj_yjmc = ''
-	  }else if(response.data.length==1){
-		  const { Gd_cpmc, Gy0_yjno, Gy0_gxh, Gy0_gxmc,jyGx} = response.data[0]
-		  formData.value.yj_yjmc=Gd_cpmc
-		  formData.value.sczl_gxmc=Gy0_gxmc
-		  formData.value.sczl_yjgx=jyGx 
-		  setColorReadonly('yjgx');
-		  setColorReadonly('gxmc');
-		  setColorReadonly('yjmc');
-	  }else{
-		  selectData.splice(0, selectData.length, ...response.data)
-		  dialogSelectVisible.value=true
-	  }
-  }
-}
+//   if (response.code === 0) {
+// 	  if(response.data.length==0){
+// 		  ElMessage({
+// 		    type: 'error',
+// 		    message: '查无此编号的工单，请仔细检查后重新输入'
+// 		  })
+// 		  //设置输入框的值为空
+// 		  formData.value.sczl_gdbh = ''
+// 		  formData.value.sczl_yjgx = ''
+// 		  formData.value.sczl_gxmc = ''
+// 		  formData.value.yj_yjmc = ''
+// 	  }else if(response.data.length==1){
+// 		  const { Gd_cpmc, Gy0_yjno, Gy0_gxh, Gy0_gxmc,jyGx} = response.data[0]
+// 		  formData.value.yj_yjmc=Gd_cpmc
+// 		  formData.value.sczl_gxmc=Gy0_gxmc
+// 		  formData.value.sczl_yjgx=jyGx 
+// 		  setColorReadonly('yjgx');
+// 		  setColorReadonly('gxmc');
+// 		  setColorReadonly('yjmc');
+// 	  }else{
+// 		  selectData.splice(0, selectData.length, ...response.data)
+// 		  dialogSelectVisible.value=true
+// 	  }
+//   }
+// }
 const dialogSelectVisible = ref(false)
 const selectData = reactive([])
 // 工单选择框

src/view/performance/Packagingoutput.vue

@@ -2,13 +2,31 @@
   <div>
     <!-- 左侧树形结构 -->
     <el-container>
-      <el-aside width="250px">
+      <!-- <el-aside width="250px">
         <div class="JKWTree-tree">
           <h3>包装工序产量维护</h3>
           <el-tree :data="treeData" :props="defaultProps" highlight-current="true"
             @node-click="handleNodeClick"></el-tree>
         </div>
-      </el-aside>
+      </el-aside> -->
+	  
+	  <layout-sider
+	     :resize-directions="['right']"
+	     :width="220"
+	     style="margin-right: 10px;"
+	   >
+	     <div
+	       class="JKWTree-tree"
+	       style="height: 70vh;"
+	     >
+	       <h3>包装工序产量维护</h3>
+	       <el-tree
+	         :data="treeData"
+	         highlight-current
+	         @node-click="handleNodeClick"
+	       />
+	     </div>
+	   </layout-sider>
 
       <el-container>
         <el-main>
@@ -405,7 +423,7 @@ import { ElMessage, ElMessageBox, LAST_KEYS } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
-
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
 defineOptions({
   name: '06-packingDocuments'
 })

src/view/performance/chejianbaogong.vue

@@ -1624,6 +1624,7 @@ const FacilityProduction = async () => {
 				// // console.log(sczl_name)
 	   //        }
 	   //      }
+	   console.log()
 	   const responses = await MachineDetailList({workshop:CJMC});
 	   if(responses.code===0){
 		   responses.data.map(item=>{
@@ -2128,6 +2129,11 @@ const GetMachineMac = async () => {
     };
     treeData.value.push(newNode);
 	CJMC=newNode.label
+	console.log('1231231233')
+	console.log('1231231233')
+	console.log('1231231233')
+	console.log('1231231233')
+	console.log(CJMC)
     JTMC = newNode.children[0].label;
     FacilityProduction();
   }

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -2555,9 +2555,15 @@ const enterDialog = async () => {
     ElMessage({ type: 'warning', message: '重点工单数据中 只允许出现中文、数字、空格' });
     return false;
   }
+  const formatDate = (date) => {
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
+  };
   const formattedData = {
     lx: scgdformData.value['重点工单'],
-    kdrq: scgdformData.value['开单日期'],
+    kdrq: formatDate(new Date(scgdformData.value['开单日期'])),
     gdbh: scgdformData.value['工单编号'],
     scfl: scgdformData.value['生产类型'],
     khdh: scgdformData.value['客户代号'],
@@ -2585,6 +2591,7 @@ const enterDialog = async () => {
     avg:scgdformData.value['平均合格率'] === undefined ? '' : scgdformData.value['平均合格率'],
     printID: scgdformData.value['印件ID'],
   };
+  
   const WorkOrderEdit_edit = await WorkOrderEdit(formattedData);
   if (WorkOrderEdit_edit.code === 0) {
     dialogFormVisible.value = false
@@ -2734,7 +2741,7 @@ const gdgyenterDialog = async () => {
       UniqId: gdgyformData['UniqId'],
       workOrder: _Gd_gdbh.value,
     };
-    const ProcessDetailEdit_edit = await ProcessDetailEdit(formattedData);
+    // const ProcessDetailEdit_edit = await ProcessDetailEdit(formattedData);
     if (ProcessDetailEdit_edit.code === 0) {
       gdgydialogFormVisible.value = false
       ElMessage({type: 'success',message: '更新成功' })
@@ -2747,6 +2754,7 @@ const gdgyenterDialog = async () => {
   gdgyformData['设备编号'] = [];
 }
 
+
 //工艺列表修改【关闭弹窗】
 const gdgycloseDialog = () => {
   gdgyformData['设备编号'] = [];