运营管理

src/api/yunyin/yunying.js

@@ -51,11 +51,11 @@ export const getProductData = (params) => {
     })
 }
 //4.获取单个工艺数据（排产参数调整）
-export const getProductGy = (data) => {
+export const getProductGy = (params) => {
     return service({
         url: '/mes_server/product/getProductGy',
         method: 'get',
-        data
+        params
     })
 }
 //5.修改产品工艺(排产参数调整)
@@ -78,7 +78,7 @@ export const editProduct = (data) => {
 export const setProductStatus = (data) => {
     return service({
         url: '/mes_server/product/setProductStatus',
-        method: 'get',
+        method: 'post',
         data
     })
 }

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -28,16 +28,63 @@
               <!--        查询和重置按钮 -->
               <el-form-item>
                 <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+
+                <el-button type="primary" icon="edit" @click="onStatusClick">状态设置</el-button>
+                <el-dialog v-model="onstatuslist" title="状态设置" width="20%" style="height: 25%; position: fixed; bottom: 35%; left: 40%">
+                  <div style="display: flex; flex-direction: column; align-items: center; height: 100%;">
+                    <div style="width: 100%; height: 230px; margin: 0 auto; padding: 0px">
+                      <div style="width: 100%; height: 50px;">
+                        <el-radio-group v-model="status">
+                          <el-radio label="在产">在产</el-radio>
+                          <el-radio label="停产">停产</el-radio>
+                        </el-radio-group>
+                      </div>
+                      <div style="width: 100%; display: flex; justify-content: center; align-items: flex-end; height: 35%;">
+                        <div slot="footer" class="dialog-footer" style="text-align: center;">
+                          <el-button @click="handleCancel">取 消</el-button>
+                          <el-button type="primary" @click="handleConfirm">确定</el-button>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </el-dialog>
+
+                <el-button type="primary" icon="edit" @click="gygmClick" style="margin-left: 10px">工艺方案更名</el-button>
+                <el-dialog v-model="gygmlist" title="工艺方案更名" width="40%" style="height: 40%; position: fixed; bottom: 30%; left: 30%">
+                  <div style="display: flex; flex-direction: column;  height: 100%;">
+                    <el-form-item label="产品代号:" prop="process">
+                      <el-input v-model="formData['process']" :clearable="true" placeholder="" style="width: 160px;"/>
+                    </el-form-item>
+                    <br>
+                    <el-form-item label=" " prop="processName">
+                      <el-input v-model="formData['processName']" disabled :clearable="true" placeholder="" style="width: 100%;" />
+                    </el-form-item>
+                    <br>
+                    <el-form-item label="工艺方案原名:" prop="originalName">
+                      <el-input v-model="formData['originalName']" disabled :clearable="true" placeholder="" style="width: 160px;"/>
+                    </el-form-item>
+                    <br>
+                    <el-form-item label="工艺方案新名:" prop="newName" >
+                      <el-input v-model="formData['newName']" :clearable="true" placeholder="" style="width: 160px;"/>
+                    </el-form-item>
+
+                    <div class="dialog-footer" style="margin-top: 15px; margin-left: 280px;">
+                      <el-button @click="gygmhandleCancel">取 消</el-button>
+                      <el-button type="primary" @click="gygmhandleConfirm">确定</el-button>
+                    </div>
+                  </div>
+                </el-dialog>
+
 <!--                <el-button icon="refresh" @click="onReset">重置</el-button>-->
 <!--                <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>-->
-                <el-button type="primary" icon="Download" @click="cpexportToExcel">导出产品资料</el-button>
+                <el-button type="primary" disabled icon="Download" @click="cpexportToExcel" style="margin-left: 10px">导出产品资料</el-button>
                 <el-dialog v-model="cpdialogexportToExcel" title="导出产品资料" width="50%">
                   <!-- 在这里放入弹出页面的内容 -->
 
                 </el-dialog>
 
 
-                <el-button type="primary" icon="Download" @click="gyexportToExcel" style="margin-left: 10px">导出工艺流程</el-button>
+                <el-button type="primary" disabled icon="Download" @click="gyexportToExcel" style="margin-left: 10px">导出工艺流程</el-button>
                 <el-dialog v-model="gydialogexportToExcel" title="导出工艺流程" width="50%">
                   <!-- 在这里放入弹出页面的内容 -->
                   <p>这是弹出页面的内容 导出工艺流程</p>
@@ -97,12 +144,14 @@
               <el-table ref="multipleTable"
                         :show-overflow-tooltip="true"
                         highlight-current-row="true"
+                        @row-dblclick="yjupdateCompanyFunc"
                         style="width: 100%;height: 400px" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55" />
                 <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="340" />
-                <el-table-column align="left" label="纸张名称" prop="yj_zzdh" width="100"/>
+                <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" />
@@ -118,6 +167,7 @@
               <el-table ref="multipleTable"
                         highlight-current-row="true"
                         :show-overflow-tooltip="true"
+                        @row-dblclick="gyupdateCompanyFunc"
                         style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55" />
                 <el-table-column align="left" label="方案" prop="方案"  width="70"/>
@@ -147,6 +197,7 @@
             <el-tab-pane label="印版资料" @click="showTable('印版资料')" name="third">
             <el-table ref="multipleTable"
                       highlight-current-row="true"
+                      @row-dblclick="ybupdateCompanyFunc"
                       style="width: 100%;height: 400px" border tooltip-effect="dark" :data="ybtableData" row-key="ID" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="55" />
               <el-table-column align="left" label="方案" prop="YB_方案"  width="100"/>
@@ -182,24 +233,34 @@
           </el-tabs>
 
           <!-- 弹窗 -->
-          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加产品资料':'修改产品资料'" destroy-on-close>
+          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加产品基本资料':'修改产品基本资料'" destroy-on-close>
             <el-row>
               <el-scrollbar height="500px">
                 <el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
                   <el-row>
-                    <el-col :span="8">
+                    <el-col :span="10">
+                      <el-form-item label="客户编号:" prop="address">
+                        <el-input v-model="formDataTest['客户编号']" :clearable="true" placeholder="" style="width: 120px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="客户名称:" prop="gender">
+                        <el-input v-model="formDataTest['客户名称']" :clearable="true" placeholder=""  />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
                       <el-form-item label="印品代号:" prop="address">
-                        <el-input v-model="formDataTest['U8UID']" :clearable="true" placeholder="" style="width: 120px;" />
+                        <el-input v-model="formDataTest['U8UID']" :clearable="true" placeholder="" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="6">
                       <el-form-item label="版本号:" prop="gender">
-                        <el-input v-model="formDataTest['版本号']" :clearable="true" placeholder="" style="width: 100px;" />
+                        <el-input v-model="formDataTest['版本号']" :clearable="true" placeholder=""/>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="10">
+                    <el-col :span="6">
                       <el-form-item label="客户料号:" prop="idCard">
-                        <el-input v-model="formDataTest['客户料号']" :clearable="true" placeholder="" style="width: 210px;" />
+                        <el-input v-model="formDataTest['客户料号']" :clearable="true" placeholder=""  />
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -211,22 +272,23 @@
                     </el-col>
                   </el-row>
                   <el-row>
-                    <el-col :span="12">
+                    <el-col :span="10">
                       <el-form-item label="产品类别:" prop="department">
-                        <el-input v-model="formDataTest['产品类别']" :clearable="true" placeholder="" style="width: 180px;" />
+                        <el-input v-model="formDataTest['产品类别']" :clearable="true" placeholder="" />
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="10">
                       <el-form-item label="单位:" prop="department">
-                        <el-input v-model="formDataTest['计量单位']" :clearable="true" placeholder="" style="width: 180px;" />
+                        <el-input v-model="formDataTest['计量单位']" :clearable="true" placeholder=""  />
                       </el-form-item>
                     </el-col>
                   </el-row>
+                  <el-col :span="24">
                   <el-form-item label="成品规格:" prop="department">
                     <el-input v-model="formDataTest['成品规格']" :clearable="true" placeholder="" />
                   </el-form-item>
-
-                    <el-col :span="20">
+                  </el-col>
+                    <el-col :span="24">
                       <el-form-item label="产品备注:" prop="remark">
                         <el-input type="textarea" v-model="formDataTest['产品备注']" :rows="4" :clearable="true" placeholder=""  />
                       </el-form-item>
@@ -244,6 +306,257 @@
             </template>
           </el-dialog>
 
+          <!-- 印件资料 修改弹窗 -->
+          <el-dialog v-model="yjdialogFormVisible" :before-close="yjcloseDialog" :title="type==='create'?'添加产品基本资料':'修改产品基本资料'" destroy-on-close>
+            <el-row>
+              <el-scrollbar height="500px">
+                <el-form :model="yjformDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="140px">
+                  <el-row>
+                    <el-form-item label="印件号:" prop="address">
+                      <el-input v-model="yjformDataTest['yj_yjno']" clearable placeholder="请输入印件号" style="width: 140px;" />
+                    </el-form-item>
+                  </el-row>
+                  <el-row>
+                    <el-form-item label="印件代号:" prop="address">
+                      <el-input v-model="yjformDataTest['yj_yjdh']" clearable placeholder="请输入印件代码" style="width: 140px;" />
+                    </el-form-item>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">
+                    <el-form-item label="印件名称:" prop="address">
+                      <el-input v-model="yjformDataTest['yj_yjmc']" clearable placeholder="请输入印件代码" style="width: 100%;" />
+                    </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="纸张:" prop="address">
+                        <el-row>
+                            <el-input v-model="yjformDataTest['yj_zzdh']" clearable placeholder="" style="width: 120px;" />
+                            <el-input v-model="yjformDataTest['yj_zzmc']" clearable placeholder=""  style="width: 460px;" />
+                        </el-row>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="12">
+                      <el-form-item label="投料（mm*mm）:" prop="address">
+                        <el-input v-model="yjformDataTest['yj_tlgg']" clearable placeholder="请输入投料规格"  style="width: 140px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="开料（mm*mm）:" prop="address">
+                        <el-input v-model="yjformDataTest['yj_klgg']" clearable placeholder="请输入开料规格" style="width: 140px;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="12">
+                      <el-form-item label="开数:" prop="address">
+                        <el-input v-model="yjformDataTest['yj_ks']" clearable placeholder="请输入开数" style="width: 140px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="联数:" prop="address">
+                        <el-input v-model="yjformDataTest['yj_ls']" clearable placeholder="请输入联数"  style="width: 140px;"/>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="备注说明:" prop="remark">
+                        <el-input type="textarea" v-model="yjformDataTest['yj_desc']" rows="4" clearable placeholder="请输入备注说明"  />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+              </el-scrollbar>
+            </el-row>
+            <template #footer>
+              <div class="dialog-footer">
+                <el-button @click="yjcloseDialog">取 消</el-button>
+                <el-button type="primary" @click="yjenterDialog">确 定</el-button>
+              </div>
+            </template>
+          </el-dialog>
+
+          <!-- 工艺资料 修改弹窗 -->
+          <el-dialog v-model="gydialogFormVisible" :before-close="gycloseDialog" :title="type==='create'?'添加工艺产品基本资料':'修改工艺产品基本资料'" destroy-on-close>
+            <el-row>
+              <el-scrollbar height="500px">
+                <el-form :model="gyformDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px" >
+                  <el-row>
+                    <el-col :span="5">
+                      <el-form-item label="工序方案:" prop="address">
+                        <el-input v-model="gyformDataTest['方案']" clearable placeholder="" style="width: 90px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                      <el-form-item label="印件编号:" prop="address">
+                        <el-input v-model="gyformDataTest['Gy0_yjno']" clearable placeholder="" style="width: 90px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                      <el-form-item label="工序编号:" prop="address">
+                        <el-input v-model="gyformDataTest['Gy0_gxh']" clearable placeholder="" style="width: 90px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                      <el-form-item label="加工开数" prop="address">
+                        <el-input v-model="gyformDataTest['Gy0_Ks']" clearable placeholder="" style="width: 90px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                      <el-form-item label="加工联数:" prop="address">
+                        <el-input v-model="gyformDataTest['Gy0_ls']" clearable placeholder="" style="width: 90px;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row>
+                    <el-col :span="6">
+                      <el-form-item label="车间名称:" prop="address">
+                        <el-input v-model="gyformDataTest['gy0_site']" clearable placeholder="" style="width: 140px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="工艺名称:" prop="address">
+                        <el-input v-model="gyformDataTest['gy0_gxmc']" clearable placeholder="" style="width: 140px;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="工序名称:" prop="address">
+                        <el-input v-model="gyformDataTest['add_gxmc']" clearable placeholder="" style="width: 100%;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row>
+                    <el-col :span="6">
+                      <el-form-item label="可用设备:" prop="address">
+                        <el-input v-model="gyformDataTest['Gy0_sbbh']" clearable placeholder="" style="width: 140px;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row>
+                    <el-col :span="5">
+                      <el-form-item label="标准损耗:" prop="address">
+                        <el-input v-model="gyformDataTest['Gy0_shdh']" clearable placeholder="" style="width: 90px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="5">
+                      <el-form-item label="基础损耗:" prop="address">
+                        <el-input v-model="gyformDataTest['基础损耗']" clearable placeholder="" style="width: 90px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="损耗率" prop="address">
+                        <el-input v-model="gyformDataTest['损耗率']" clearable placeholder="" style="width: 90px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="工价系数:" prop="address">
+                        <el-input v-model="gyformDataTest['工价系数']" clearable placeholder="" style="width: 90px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="损耗系数:" prop="address">
+                        <el-input v-model="gyformDataTest['损耗系数']" clearable placeholder="" style="width: 90px;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="工序备注:" prop="remark">
+                        <el-input type="textarea" v-model="gyformDataTest['备注']" rows="4" clearable placeholder="请输入备注说明" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+              </el-scrollbar>
+            </el-row>
+            <template #footer>
+              <div class="dialog-footer">
+                <el-button @click="gycloseDialog">取 消</el-button>
+                <el-button type="primary" @click="gyenterDialog">确 定</el-button>
+              </div>
+            </template>
+          </el-dialog>
+
+          <!-- 印版资料 修改弹窗 -->
+          <el-dialog v-model="ybdialogFormVisible" :before-close="ybcloseDialog" :title="type==='create'?'添加产品印版资料':'修改产品印版资料'" destroy-on-close>
+            <el-row>
+              <el-scrollbar height="500px">
+                <el-form :model="ybformDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px" >
+                  <el-row>
+                    <el-col :span="8">
+                      <el-form-item label="工序方案:" prop="address">
+                        <el-input v-model="ybformDataTest['YB_方案']" clearable placeholder="" style="width: 100px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                      <el-form-item label="印件号:" prop="address">
+                        <el-input v-model="ybformDataTest['YB_Yjno']" clearable placeholder="" style="width: 100px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                      <el-form-item label="工序编号:" prop="address">
+                        <el-input v-model="ybformDataTest['']" clearable placeholder="" style="width: 100px;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="工艺名称:" prop="address">
+                        <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="工序名称:" prop="address">
+                        <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="10 ">
+                      <el-form-item label="存货编码:" prop="address">
+                        <el-input v-model="ybformDataTest['存货编码']" clearable placeholder="" style="width: 140px;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="存货名称:" prop="address">
+                        <el-input v-model="ybformDataTest['印版名称']" clearable placeholder="" style="width: 100%;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="印版备注:" prop="address">
+                        <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+              </el-scrollbar>
+            </el-row>
+            <template #footer>
+              <div class="dialog-footer">
+                <el-button @click="ybcloseDialog">取 消</el-button>
+                <el-button type="primary" @click="ybenterDialog">确 定</el-button>
+              </div>
+            </template>
+          </el-dialog>
+
         </el-main>
       </el-container>
     </el-container>
@@ -280,35 +593,106 @@ import {createCompany, deleteCompany, deleteCompanyByIds, updateCompany, findCom
 import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
-import {getCustom, getDepartment, getProduct, getProductData, getStaffList} from "@/api/yunyin/yunying";
+import {
+  getCustom,
+  getDepartment,
+  getProduct,
+  getProductData,
+  getProductGy,
+  getStaffList,
+  setProductStatus
+} from "@/api/yunyin/yunying";
 defineOptions({   name: 'Company'})
+
 // =========== 导出Excel表格 ===========
 //导出产品
+const cpdialogexportToExcel = ref(false)
 const cpexportToExcel = () => {
   console.log('点击了导出产品按钮')
   cpdialogexportToExcel.value = true;
 }
-//导出工艺流程
+
+//导出工艺
+const gydialogexportToExcel = ref(false)
 const gyexportToExcel = () => {
   console.log('点击了导出工艺流程按钮')
   gydialogexportToExcel.value = true;
 }
-// 导出Excel弹窗
-const cpdialogexportToExcel = ref(false)
-const gydialogexportToExcel = ref(false)
+
+// =========== 状态设置 ===========
+const onstatuslist = ref(false);
+const status = ref('在产'); // 默认选择在产
+const _stacode = ref(null);
+const onStatusClick = () => {
+  console.log('点击了状态设置');
+  if(_product_code.value == null){
+    onstatuslist.value = false;
+    alert('请选择树形后，再操作此功能');
+  }else{
+    _stacode.value = _product_code.value;
+    onstatuslist.value = true;
+  }
+};
+// 状态设置取消按钮
+const handleCancel = () => {
+  onstatuslist.value = false;
+  console.log('点击了取消');
+};
+// 状态设置确定按钮
+const handleConfirm = async () => {
+  onstatuslist.value = false;
+  // if(_stacode.value == null){
+  //   alert('请选择树形后，再操作此功能');
+  // }else{
+    let statusCode;
+    let code = _stacode.value;
+    if (status.value === '在产') {
+      statusCode = 1;
+    } else if (status.value === '停产') {
+      statusCode = 2;
+    }
+    // console.log(code);console.log(statusCode);
+    const data = await setProductStatus({ code: code, status: statusCode });
+    console.log(data);
+  // }
+};
+handleCancel(_stacode);
+
+// =========== 工艺方案更名 ===========
+const gygmlist = ref(false);
+const _gygmstacode = ref(null);
+const gygmClick = () => {
+  console.log('点击了工艺方案更名');
+  // _gygmstacode.value = _product_code.value;
+  // console.log(_product_code.value);
+  if(_product_code.value == null){
+    gygmlist.value = false;
+    alert('请选择分类项目，然后在进入操作');
+  }else{
+    gygmlist.value = true;
+    let code = _product_code.value;
+    console.log(code);
+  }
+};
+// 状态设置取消按钮
+const gygmhandleCancel = () => {
+  gygmlist.value = false;
+  console.log('点击了取消');
+};
+// 状态设置确定按钮
+const gygmhandleConfirm = async () => {
+  gygmlist.value = false;
+
+
+};
+gygmhandleCancel(_gygmstacode);
 
 // =========== 左侧树侧形结构 ===========
 const treeData = ref({})
 const getCustomdata = async () => {
   try {
-    const data  = await getCustom() //接口调用函数
+    const data  = await getCustom()
     treeData.value = data.data;
-    // const response = await getCustom(); // 调用接口获取数据
-    // const formatCustomData = response.data.map(item => ({
-    //   children: [],
-    //   label: `${item.客户编号}【${item.客户名称}】`,
-    // }));
-    // treeData.value = formatCustomData
   } catch (error) {
     console.error('Error fetching custom data:', error);
   }
@@ -321,10 +705,6 @@ const _custom_code = ref(null)
 const handleNodeClick = async (node) => {
   _custom_code.value = node.客户编号;
   _getProduct()
-  // const custom_code = node.客户编号;
-  // const WorkListdata = await getProduct({ custom_code:custom_code, limit: pageSize.value, page: page.value });
-  // tableData.splice(0, tableData.length, ...WorkListdata.data.data);//表格
-  // total.value = tableData.length;//共多少条
 };
 //印件资料
 const yjtableData = reactive([])
@@ -334,12 +714,11 @@ const gytableData = reactive([])
 const ybtableData = reactive([])
 //技术资料附件
 const jstableData = reactive([])
+const _product_code = ref(null)
 const tableRowClick = async (row) => {
-  //点击表格获取 产品编号
   const product_code = row.产品编号;
-  // console.log(product_code);
+  _product_code.value = row.产品编号;
   const res = await getProductData({product_code:product_code});//接口
-  // console.log(res);
   yjtableData.splice(0, yjtableData.length, ...res.data.yjData);//印件资料表格
   gytableData.splice(0, gytableData.length, ...res.data.gyData);//工艺资料表格
   ybtableData.splice(0, ybtableData.length, ...res.data.ybData);//印版资料表格
@@ -360,7 +739,8 @@ const _getProduct = async ()=>{
   }
 }
 
-// 分页
+
+// ========分页==============
 const handleCurrentChange = (val) => {
   page.value = val;
   _getProduct();
@@ -377,6 +757,26 @@ const total = ref(0)
 const pageSize = ref(10)
 
 
+const elFormRef = ref()
+const elSearchFormRef = ref()
+const searchInfo = ref({})
+// 搜索
+const onSubmit = () => {
+
+}
+
+// 查询
+const getTableData = async() => {
+
+}
+getTableData()
+
+// 重置
+const onReset = () => {
+  searchInfo.value = {}
+  getTableData()
+}
+
 // 自动化生成的字典（可能为空）以及字段
 const formData = ref({
   address: '',
@@ -402,27 +802,6 @@ const searchRule = reactive({
       }, trigger: 'change' }
   ],
 })
-const elFormRef = ref()
-const elSearchFormRef = ref()
-const searchInfo = ref({})
-// 搜索
-const onSubmit = () => {
-
-}
-
-// 查询
-const getTableData = async() => {
-
-}
-getTableData()
-
-// 重置
-const onReset = () => {
-  searchInfo.value = {}
-  getTableData()
-}
-
-// ============== 表格控制部分结束 ===============
 
 // 获取需要的字典 可能为空 按需保留
 const setOptions = async () =>{
@@ -434,56 +813,108 @@ setOptions()
 //行为控制标记（弹窗内部需要增还是改）
 const type = ref('')
 
+//=========表格列表修改========
 let formDataTest = reactive({})
 //修改
 const updateCompanyFunc = async (row) => {
-  const product_code = row.产品编号;
-  // console.log(product_code);
   formDataTest = row;
   console.log(row);
   dialogFormVisible.value = true;
 };
-
-// 弹窗控制标记
+// 弹窗
 const dialogFormVisible = ref(false)
-
-// 查看详情控制标记
-const detailShow = ref(false)
-
-// 打开详情弹窗
-const openDetailShow = () => {
-  detailShow.value = true
+// 打开弹窗
+const openDialog = () => {
+  type.value = 'create'
+  dialogFormVisible.value = true
 }
 
-// 打开详情
-const getDetails = async (row) => {
-  // 打开弹窗
-  const res = await findCompany({ ID: row.ID })
-  if (res.code === 0) {
-    formData.value = res.data.recompany
-    openDetailShow()
+// 关闭弹窗
+const closeDialog = () => {
+  dialogFormVisible.value = false
+  formData.value = {
+    address: '',
+    image: '',
+    name: '',
   }
 }
 
-// 关闭详情弹窗
-const closeDetailShow = () => {
-  detailShow.value = false
+//=========印件修改========
+let yjformDataTest = reactive({})
+//修改
+const yjupdateCompanyFunc = async (row) => {
+  yjformDataTest = row;
+  console.log(row);
+  yjdialogFormVisible.value = true;
+};
+// 弹窗
+const yjdialogFormVisible = ref(false)
+// 打开弹窗
+const yjopenDialog = () => {
+  type.value = 'create'
+  yjdialogFormVisible.value = true
+}
+// 关闭弹窗
+const yjcloseDialog = () => {
+  yjdialogFormVisible.value = false
   formData.value = {
     address: '',
     image: '',
     name: '',
   }
 }
-
+//=========工艺修改========
+let gyformDataTest = reactive({})
+//修改
+const gyupdateCompanyFunc = async (row) => {
+  // const product_code = row.产品编号;
+  const product_code = _product_code.value;
+  console.log(product_code);
+  const res = await getProductGy({product_code:product_code});//接口
+  console.log(res);
+  gyformDataTest = row;
+  // console.log(row);
+  gydialogFormVisible.value = true;
+};
+// 弹窗
+const gydialogFormVisible = ref(false)
 // 打开弹窗
-const openDialog = () => {
+const gyopenDialog = () => {
   type.value = 'create'
-  dialogFormVisible.value = true
+  gydialogFormVisible.value = true
 }
-
 // 关闭弹窗
-const closeDialog = () => {
-  dialogFormVisible.value = false
+const gycloseDialog = () => {
+  gydialogFormVisible.value = false
+  formData.value = {
+    address: '',
+    image: '',
+    name: '',
+  }
+}
+//=========印版修改========
+let ybformDataTest = reactive({})
+//修改
+const ybupdateCompanyFunc = async (row) => {
+  // const product_code = row.产品编号;
+  const product_code = _product_code.value;
+  console.log(row);
+  // const res = await getProductGy({product_code:product_code});//接口
+  // console.log(res);
+  ybformDataTest = row;
+  // console.log(row);
+  ybdialogFormVisible.value = true;
+};
+// 弹窗
+const ybdialogFormVisible = ref(false)
+// 打开弹窗
+const ybopenDialog = () => {
+  type.value = 'create'
+  ybdialogFormVisible.value = true
+}
+// 关闭弹窗
+const ybcloseDialog = () => {
+  ybdialogFormVisible.value = false
   formData.value = {
     address: '',
     image: '',

src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -1,202 +1,202 @@
 <template>
-	<div style="margin: 0 auto">
-		<el-container>
-			<!-- 左侧树形结构 -->
-			<el-aside width="210px" >
-				<div class="JKWTree-tree" style="height: 746px">
-					<h3>组织架构</h3>
-					<el-tree :data="treeData"  :props="defaultProps" @node-click="handleNodeClick" @node-expand="handleNodeExpand">
+  <div style="margin: 0 auto">
+    <el-container>
+      <!-- 左侧树形结构 -->
+      <el-aside width="210px" >
+        <div class="JKWTree-tree" style="height: 746px">
+          <h3>组织架构</h3>
+          <el-tree :data="treeData"  :props="defaultProps" @node-click="handleNodeClick" @node-expand="handleNodeExpand">
             <template #default="{node,data}">
               {{data['名称']}}<{{data['num']}}人>
             </template>
           </el-tree>
-				</div>
-			</el-aside>
+        </div>
+      </el-aside>
 
-			<!-- 右侧内容区域 -->
-			<el-container>
-				<el-main>
-					<!-- 搜索框 -->
-					<div class="gva-search-box">
-						<el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
-							<!-- 左侧查询输入框 -->
-							<el-form-item>
-								<el-input v-model="searchInfo.ke" placeholder="搜索员工编号或员工姓名" clearable style="width: 200px;"></el-input>
-							</el-form-item>
-							<!-- 右侧查询和重置按钮 -->
-							<el-form-item>
-								<el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-<!--								<el-button icon="refresh" @click="onReset">重置</el-button>-->
+      <!-- 右侧内容区域 -->
+      <el-container>
+        <el-main>
+          <!-- 搜索框 -->
+          <div class="gva-search-box">
+            <el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
+              <!-- 左侧查询输入框 -->
+              <el-form-item>
+                <el-input v-model="searchInfo.ke" placeholder="搜索员工编号或员工姓名" clearable style="width: 200px;" @input="onSubmit"></el-input>
+              </el-form-item>
+              <!-- 右侧查询和重置按钮 -->
+              <el-form-item>
+                <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+                <!--								<el-button icon="refresh" @click="onReset">重置</el-button>-->
                 <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
                 <el-button type="primary" icon="Download" @click="exportToExcel" style="float: right;">导出到Excel</el-button>
                 <el-dialog v-model="dialogexportToExcel" title="员工基本资料导出" width="50%">
 
                 </el-dialog>
-							</el-form-item>
-						</el-form>
-					</div>
+              </el-form-item>
+            </el-form>
+          </div>
 
-					<!-- 表格及操作按钮 -->
-					<div class="gva-table-box">
+          <!-- 表格及操作按钮 -->
+          <div class="gva-table-box">
 
-						<!-- 导出字段选择对话框 -->
-						<el-dialog title="选择导出字段" :visible.sync="exportDialogVisible" width="30%">
-							<el-checkbox-group v-model="selectedExportFields">
-								<el-checkbox label="employeenumber">员工编号</el-checkbox>
-								<el-checkbox label="employeename">员工姓名</el-checkbox>
-								<el-checkbox label="gender">性别</el-checkbox>
-								<!-- 添加更多字段选项 -->
-							</el-checkbox-group>
-							<div slot="footer" class="dialog-footer">
-								<el-button @click="exportDialogVisible = false">取 消</el-button>
-								<el-button type="primary" @click="exportSelectedFields">确 定</el-button>
-							</div>
-						</el-dialog>
+            <!-- 导出字段选择对话框 -->
+            <el-dialog title="选择导出字段" :visible.sync="exportDialogVisible" width="30%">
+              <el-checkbox-group v-model="selectedExportFields">
+                <el-checkbox label="employeenumber">员工编号</el-checkbox>
+                <el-checkbox label="employeename">员工姓名</el-checkbox>
+                <el-checkbox label="gender">性别</el-checkbox>
+                <!-- 添加更多字段选项 -->
+              </el-checkbox-group>
+              <div slot="footer" class="dialog-footer">
+                <el-button @click="exportDialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="exportSelectedFields">确 定</el-button>
+              </div>
+            </el-dialog>
 
-						<!-- 表格 -->
-						<el-table ref="multipleTable"
+            <!-- 表格 -->
+            <el-table ref="multipleTable"
                       style="width: 100%;height: 580px"
                       tooltip-effect="dark"
                       :data="tableData"
                       border
-							        row-key="ID"
+                      row-key="ID"
                       highlight-current-row="true"
                       @row-dblclick="updateCompanyFunc"
                       @row-click="tableRowClick"
                       @selection-change="handleSelectionChange">
-							<el-table-column type="selection" width="55" />
-							<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="性别" />
-							<el-table-column align="left" label="聘用日期" prop="聘用日期" width="160" />
-							<el-table-column align="left" label="转正日期" prop="转正日期" width="160" />
-							<el-table-column align="left" label="所在部门" prop="所在部门" width="140"  />
-							<el-table-column align="left" label="职称职务" prop="职称职务" width="300" />
-							<el-table-column align="left" label="身份证号" prop="身份证号" width="170" />
-							<el-table-column align="left" label="出生日期" prop="出生日期" width="160" />
-							<el-table-column align="left" label="人员性质" prop="人员性质" width="120" />
-							<el-table-column align="left" label="人员类别" prop="人员类别" width="100" />
-							<el-table-column align="left" label="班次类型" prop="班次类型" width="120" />
-							<el-table-column align="left" label="工资表类别" prop="工资表类别" width="160" />
-							<el-table-column align="left" label="薪酬核算分组" prop="薪酬核算分组" width="120" />
-							<el-table-column align="left" label="MES在职" prop="在职状态" width="100" />
-							<el-table-column align="left" label="U8在职" prop="U8在职" width="100" />
-							<el-table-column align="left" label="U8离职日期" prop="U8离职日期" width="160" />
-							<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>
-						<!-- 分页 -->
-						<div class="gva-pagination">
-							<el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page"
-								:page-size="pageSize" :page-sizes="[10, 30, 50, 100]" :total="total"
-								@current-change="handleCurrentChange" @size-change="handleSizeChange" />
-						</div>
-					</div>
+              <el-table-column type="selection" width="55" />
+              <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="性别" />
+              <el-table-column align="left" label="聘用日期" prop="聘用日期" width="160" />
+              <el-table-column align="left" label="转正日期" prop="转正日期" width="160" />
+              <el-table-column align="left" label="所在部门" prop="所在部门" width="140"  />
+              <el-table-column align="left" label="职称职务" prop="职称职务" width="300" />
+              <el-table-column align="left" label="身份证号" prop="身份证号" width="170" />
+              <el-table-column align="left" label="出生日期" prop="出生日期" width="160" />
+              <el-table-column align="left" label="人员性质" prop="人员性质" width="120" />
+              <el-table-column align="left" label="人员类别" prop="人员类别" width="100" />
+              <el-table-column align="left" label="班次类型" prop="班次类型" width="120" />
+              <el-table-column align="left" label="工资表类别" prop="工资表类别" width="160" />
+              <el-table-column align="left" label="薪酬核算分组" prop="薪酬核算分组" width="120" />
+              <el-table-column align="left" label="MES在职" prop="在职状态" width="100" />
+              <el-table-column align="left" label="U8在职" prop="U8在职" width="100" />
+              <el-table-column align="left" label="U8离职日期" prop="U8离职日期" width="160" />
+              <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>
+            <!-- 分页 -->
+            <div class="gva-pagination">
+              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page"
+                             :page-size="pageSize" :page-sizes="[10, 30, 50, 100]" :total="total"
+                             @current-change="handleCurrentChange" @size-change="handleSizeChange" />
+            </div>
+          </div>
 
-					<!-- 弹窗 -->
-					<el-dialog
+          <!-- 弹窗 -->
+          <el-dialog
               v-model="dialogFormVisible"
               :before-close="closeDialog"
-						:title="type==='create'?'添加员工基本资料':'修改员工基本资料'"
+              :title="type==='create'?'添加员工基本资料':'修改员工基本资料'"
               destroy-on-close
           >
-						<el-row>
-							<!-- 左侧表单 -->
-							<el-col :span="8">
-								<el-scrollbar height="500px">
-									<el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
-										<el-form-item label="员工编号:" prop="address">
-											<el-input v-model="formDataTest['员工编号']" :clearable="true" placeholder="请输入员工编号" style="width: 180px;" />
-										</el-form-item>
-										<el-form-item label="性别:" prop="gender">
-											<el-input v-model="formDataTest['性别']" :clearable="true" placeholder="请输入性别" style="width: 180px;" />
-										</el-form-item>
-										<el-form-item label="身份证号:" prop="idCard">
-											<el-input v-model="formDataTest['身份证号']" :clearable="true" placeholder="请输入身份证" style="width: 180px;" />
-										</el-form-item>
-										<el-form-item label="部门名称:" prop="department">
-											<el-input v-model="formDataTest['所在部门']" :clearable="true" placeholder="请输入部门名称" style="width: 180px;" />
-										</el-form-item>
-										<el-form-item label="入职日期:" prop="joinDate">
-											<el-input v-model="formDataTest['聘用日期']" :clearable="true" placeholder="请输入入职日期" style="width: 180px;" />
-										</el-form-item>
-										<el-form-item label="人员类别:" prop="joinDate">
-											<el-select v-model="formDataTest['人员类别']" placeholder="请选择人员类别" style="width: 180px;">
-												<el-option label="生产" value="生产"></el-option>
-												<el-option label="行政" value="行政"></el-option>
-											</el-select>
-										</el-form-item>
-										<el-form-item label="班次类型:" prop="joinDate">
-											<el-input v-model="formDataTest['班次类型']" :clearable="true" placeholder="请输入班次类型" style="width: 180px;" />
-										</el-form-item>
-										<el-form-item label="工资表类别:" prop="joinDate">
-											<el-select v-model="formDataTest['工资表类别']" placeholder="请选择工资表类别" style="width: 180px;">
-												<el-option label="职员级计时工资表" value="职员级计时工资表"></el-option>
-												<el-option label="另发工资" value="另发工资"></el-option>
-												<el-option label="操作级计件工资表" value="操作级计件工资表"></el-option>
-												<el-option label="操作级计时工资表" value="操作级计时工资表"></el-option>
-											</el-select>
-										</el-form-item>
+            <el-row>
+              <!-- 左侧表单 -->
+              <el-col :span="8">
+                <el-scrollbar height="500px">
+                  <el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
+                    <el-form-item label="员工编号:" prop="address">
+                      <el-input v-model="formDataTest['员工编号']" :clearable="true" placeholder="请输入员工编号" style="width: 180px;" />
+                    </el-form-item>
+                    <el-form-item label="性别:" prop="gender">
+                      <el-input v-model="formDataTest['性别']" :clearable="true" placeholder="请输入性别" style="width: 180px;" />
+                    </el-form-item>
+                    <el-form-item label="身份证号:" prop="idCard">
+                      <el-input v-model="formDataTest['身份证号']" :clearable="true" placeholder="请输入身份证" style="width: 180px;" />
+                    </el-form-item>
+                    <el-form-item label="部门名称:" prop="department">
+                      <el-input v-model="formDataTest['所在部门']" :clearable="true" placeholder="请输入部门名称" style="width: 180px;" />
+                    </el-form-item>
+                    <el-form-item label="入职日期:" prop="joinDate">
+                      <el-input v-model="formDataTest['聘用日期']" :clearable="true" placeholder="请输入入职日期" style="width: 180px;" />
+                    </el-form-item>
+                    <el-form-item label="人员类别:" prop="joinDate">
+                      <el-select v-model="formDataTest['人员类别']" placeholder="请选择人员类别" style="width: 180px;">
+                        <el-option label="生产" value="生产"></el-option>
+                        <el-option label="行政" value="行政"></el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="班次类型:" prop="joinDate">
+                      <el-input v-model="formDataTest['班次类型']" :clearable="true" placeholder="请输入班次类型" style="width: 180px;" />
+                    </el-form-item>
+                    <el-form-item label="工资表类别:" prop="joinDate">
+                      <el-select v-model="formDataTest['工资表类别']" placeholder="请选择工资表类别" style="width: 180px;">
+                        <el-option label="职员级计时工资表" value="职员级计时工资表"></el-option>
+                        <el-option label="另发工资" value="另发工资"></el-option>
+                        <el-option label="操作级计件工资表" value="操作级计件工资表"></el-option>
+                        <el-option label="操作级计时工资表" value="操作级计时工资表"></el-option>
+                      </el-select>
+                    </el-form-item>
 
-									</el-form>
-								</el-scrollbar>
-							</el-col>
-							<!-- 中间表单 -->
-							<el-col :span="8">
-								<el-scrollbar height="500px">
-									<el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
-										<el-form-item label="员工姓名:" prop="name">
-											<el-input v-model="formDataTest['员工姓名']" :clearable="true" placeholder="请输入姓名" style="width: 180px;" />
-										</el-form-item>
-										<el-form-item label="出生日期:" prop="birthDate">
-											<el-input v-model="formDataTest['出生日期']" :clearable="true" placeholder="" style="width: 180px;" />
-										</el-form-item>
-										<el-form-item label="职务:" prop="position">
-											<el-input v-model="formDataTest['职称职务']" :clearable="true" placeholder="请输入职务" style="width: 180px;" />
-										</el-form-item>
-<!--										<el-form-item label="部门编号:" prop="departmentId">-->
-<!--											<el-input v-model="formDataTest['部门编号']" :clearable="true" placeholder="请输入部门编号" style="width: 180px;" />-->
-<!--										</el-form-item>-->
-										<el-form-item label="转正日期:" prop="departmentId">
-											<el-input v-model="formDataTest['转正日期']" :clearable="true" placeholder="请输入转正日期" style="width: 180px;" />
-										</el-form-item>
-										<el-form-item label="扣减司龄:" prop="departmentId">
-											<el-input v-model="formDataTest['扣减司龄']" :clearable="true" placeholder="" style="width: 180px;" />
-										</el-form-item>
-										<el-form-item label="人员性质:" prop="departmentId">
-											<el-select v-model="formDataTest['人员性质']" placeholder="请选择人员性质" style="width: 180px;">
-												<el-option label="退休返聘" value="退休返聘"></el-option>
-												<el-option label="劳动合同工" value="劳动合同工"></el-option>
-												<el-option label="借用" value="借用"></el-option>
-												<el-option label="劳务派遣" value="劳务派遣"></el-option>
-												<el-option label="实习生" value="实习生"></el-option>
-											</el-select>
-										</el-form-item>
+                  </el-form>
+                </el-scrollbar>
+              </el-col>
+              <!-- 中间表单 -->
+              <el-col :span="8">
+                <el-scrollbar height="500px">
+                  <el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
+                    <el-form-item label="员工姓名:" prop="name">
+                      <el-input v-model="formDataTest['员工姓名']" :clearable="true" placeholder="请输入姓名" style="width: 180px;" />
+                    </el-form-item>
+                    <el-form-item label="出生日期:" prop="birthDate">
+                      <el-input v-model="formDataTest['出生日期']" :clearable="true" placeholder="" style="width: 180px;" />
+                    </el-form-item>
+                    <el-form-item label="职务:" prop="position">
+                      <el-input v-model="formDataTest['职称职务']" :clearable="true" placeholder="请输入职务" style="width: 180px;" />
+                    </el-form-item>
+                    <!--										<el-form-item label="部门编号:" prop="departmentId">-->
+                    <!--											<el-input v-model="formDataTest['部门编号']" :clearable="true" placeholder="请输入部门编号" style="width: 180px;" />-->
+                    <!--										</el-form-item>-->
+                    <el-form-item label="转正日期:" prop="departmentId">
+                      <el-input v-model="formDataTest['转正日期']" :clearable="true" placeholder="请输入转正日期" style="width: 180px;" />
+                    </el-form-item>
+                    <el-form-item label="扣减司龄:" prop="departmentId">
+                      <el-input v-model="formDataTest['扣减司龄']" :clearable="true" placeholder="" style="width: 180px;" />
+                    </el-form-item>
+                    <el-form-item label="人员性质:" prop="departmentId">
+                      <el-select v-model="formDataTest['人员性质']" placeholder="请选择人员性质" style="width: 180px;">
+                        <el-option label="退休返聘" value="退休返聘"></el-option>
+                        <el-option label="劳动合同工" value="劳动合同工"></el-option>
+                        <el-option label="借用" value="借用"></el-option>
+                        <el-option label="劳务派遣" value="劳务派遣"></el-option>
+                        <el-option label="实习生" value="实习生"></el-option>
+                      </el-select>
+                    </el-form-item>
                     <el-form-item label="U8状态:" prop="joinDate">
                       <el-input v-model="formDataTest['U8在职']" :clearable="true"  placeholder="" style="width: 180px;" />
                     </el-form-item>
                     <el-form-item label="在职状态:" prop="joinDate">
                       <el-input v-model="formDataTest['在职状态']" :clearable="true" placeholder="" style="width: 180px;" />
                     </el-form-item>
-									</el-form>
-								</el-scrollbar>
-							</el-col>
-							<!-- 右侧图片 -->
-						</el-row>
-						<!-- 添加 编辑页面 取消 确定 -->
-						<template #footer>
-							<div class="dialog-footer">
-								<el-button @click="closeDialog">取 消</el-button>
-								<el-button type="primary" @click="enterDialog">确 定</el-button>
-							</div>
-						</template>
-					</el-dialog>
+                  </el-form>
+                </el-scrollbar>
+              </el-col>
+              <!-- 右侧图片 -->
+            </el-row>
+            <!-- 添加 编辑页面 取消 确定 -->
+            <template #footer>
+              <div class="dialog-footer">
+                <el-button @click="closeDialog">取 消</el-button>
+                <el-button type="primary" @click="enterDialog">确 定</el-button>
+              </div>
+            </template>
+          </el-dialog>
 
-				</el-main>
-			</el-container>
-		</el-container>
-	</div>
+        </el-main>
+      </el-container>
+    </el-container>
+  </div>
 </template>
 <script setup>
 // 全量引入格式化工具 请按需保留
@@ -235,12 +235,13 @@ const numTime = 0
 //点击左侧树形 获取右侧table列表
 const tableData = reactive([])
 const handleNodeClick = async (node) => {
-  _department_code.value = node.编号;
+  _department_code.value = node['编号'];
   _getStaffList()
 };
 // 点击管理中心 显示全部数据
 const handleNodeExpand = async (node) => {
-  _department_code.value = node.编号;
+  // console.log(node)
+  _department_code.value = node['编号'];
   _getStaffList()
 
 }
@@ -249,10 +250,15 @@ const handleNodeExpand = async (node) => {
 const _getStaffList = async ()=>{
   let params = {}
   params.department_code = _department_code.value;
+  params.search = _searchValue.value;
   params.limit = pageSize.value;
   params.page = page.value;
+  params.mes_online = 1;
+  params.u8_online = 1;
+  // console.log(params)
   try {
     const WorkListdata = await getStaffList(params);//接口调用函数
+    // console.log(WorkListdata)
     tableData.splice(0,tableData.length,...WorkListdata.data.list);//表格数据
     total.value = WorkListdata.data.total;//共多少条total
   } catch (error) {
@@ -277,6 +283,21 @@ const handleSizeChange = (val) => {
   _getStaffList();
 };
 
+const _searchValue = ref(null)
+// 搜索
+const onSubmit = () => {
+  // const searchValue = searchInfo._rawValue.ke; // 获取搜索框输入的值
+  _searchValue.value = searchInfo._rawValue.ke;
+  // console.log(_searchValue);
+  _getStaffList()
+};
+
+// 查询
+const getTableData = async () => {
+  // console.log(table)
+}
+getTableData()
+
 // 自动化生成的字典（可能为空）以及字段
 const formData = ref({
   address: '',
@@ -296,8 +317,8 @@ const searchRule = reactive({
         callback(new Error('请填写开始日期'))
       } else if (searchInfo.value.startCreatedAt && searchInfo.value.endCreatedAt && (
           searchInfo.value.startCreatedAt.getTime() === searchInfo.value.endCreatedAt
-          .getTime() || searchInfo.value.startCreatedAt.getTime() > searchInfo.value
-          .endCreatedAt.getTime())) {
+              .getTime() || searchInfo.value.startCreatedAt.getTime() > searchInfo.value
+              .endCreatedAt.getTime())) {
         callback(new Error('开始日期应当早于结束日期'))
       } else {
         callback()
@@ -316,29 +337,7 @@ const onReset = () => {
   getTableData()
 }
 
-// 搜索
-const onSubmit = () => {
-  const searchValue = searchInfo._rawValue.ke; // 获取搜索框输入的值
-  console.log(searchValue);
-  // elSearchFormRef.value?.validate(async (valid) => {
-  //   if (valid) {
-  //     try {
-  //       const response = await getStaffList({ search: searchValue }); // 将搜索框输入的值作为 search 参数发送给后台
-  //       console.log(response);
-  //     } catch (error) {
-  //       console.error('发生错误:', error);
-  //     }
-  //   } else {
-  //     console.log('验证不通过');
-  //   }
-  // });
-};
 
-// 查询
-const getTableData = async () => {
-  // console.log(table)
-}
-getTableData()
 
 // 行为控制标记（弹窗内部需要增还是改）
 const type = ref('')
@@ -399,49 +398,49 @@ const enterDialog = async () => {
 </script>
 
 <style>
-	.JKWTree-container {
-		display: flex;
-	}
-	.JKWTree-tree {
-		width: 300px;
-		background-color: #fff;
-		padding: 10px;
-		margin-right: 20px;
-	}
-	.JKWTree-tree h3 {
-		font-size: 15px;
-		font-weight: 700;
-		margin: 10px 0;
-	}
-	.JKWTree-content {
-		flex: 1;
-	}
-	/* 图片上传 */
-	.upload-box {
-		width: 200px;
-		height: 200px;
-		border: 2px dashed #e2e2e2;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: relative;
-		cursor: pointer;
-	}
-	.uploaded-image {
-		width: 100%;
-		height: 100%;
-		object-fit: cover;
-	}
-	.upload-icon {
-		font-size: 40px;
-		color: #c0c4cc;
-	}
-	.file-input {
-		display: none;
-	}
-  .el-table .warning-row {
-    background: oldlace;
-  }
+.JKWTree-container {
+  display: flex;
+}
+.JKWTree-tree {
+  width: 300px;
+  background-color: #fff;
+  padding: 10px;
+  margin-right: 20px;
+}
+.JKWTree-tree h3 {
+  font-size: 15px;
+  font-weight: 700;
+  margin: 10px 0;
+}
+.JKWTree-content {
+  flex: 1;
+}
+/* 图片上传 */
+.upload-box {
+  width: 200px;
+  height: 200px;
+  border: 2px dashed #e2e2e2;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  cursor: pointer;
+}
+.uploaded-image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+.upload-icon {
+  font-size: 40px;
+  color: #c0c4cc;
+}
+.file-input {
+  display: none;
+}
+.el-table .warning-row {
+  background: oldlace;
+}
 
 /* 选中某行时的背景色*/
 .el-table__body tr.current-row>td {

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -2,10 +2,12 @@
   <div>
     <el-container>
       <!-- 左侧树形结构 -->
-      <el-aside width="270px">
+      <el-aside width="170px">
         <div class="JKWTree-tree" style="width: 100%;height: 746px">
           <h3>工单管理</h3>
-          <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+          <el-tree :data="treeData.data" :props="defaultProps" @node-click="handleNodeClick">
+
+          </el-tree>
         </div>
       </el-aside>
 
@@ -70,7 +72,9 @@
 
             <!-- 分页 -->
             <div class="gva-pagination">
-              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize" :page-sizes="[5,10, 30, 50, 100]" :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange"/>
+              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page"
+                             :page-size="pageSize" :page-sizes="[10, 30, 50, 100]" :total="total"
+                             @current-change="handleCurrentChange" @size-change="handleSizeChange" />
             </div>
           </div>
 
@@ -381,24 +385,28 @@ const exportToExcel = () => {
 // 导出Excel弹窗
 const dialogexportToExcel = ref(false)
 // =========== 左侧树侧形结构 ===========
-const treeData = ref([]);
+const treeData = reactive({data:[]});
+// const treeData = reactive({});
 const defaultProps = {
   children: 'children',
-  label: 'Gd_khmc'
+  label: 'label'
 };
 const DataListdata = async () => {
   try {
     const data = await DataList();
-    console.log(data)
-    if (data.code === 0) {
-      const dataArray = Object.values(data.data).map((item) => ({
-        ...item,
-        children: []
-      }));
-      treeData.value = dataArray;
-    } else {
-      console.error(data.msg);
+
+    for(let key in data.data)
+    {
+      let temp = data.data[key].split('【');
+      console.log('tree data list:>>',temp)
+      let object = {};
+      object.id = temp[0];
+      object.label = data.data[key]
+      object.chaildren = []
+      treeData.data.push(object)
     }
+
+
   } catch (error) {
     console.error(error);
   }
@@ -408,8 +416,8 @@ DataListdata();
 //点击左侧树形获取编号
 const tableData = reactive([])
 const handleNodeClick = async (node) => {
-  //通过 Gd_khdh 客户单号 获取列表数据
-  const Gd_khdh = node.Gd_khdh;
+  // const Gd_khdh = node.Gd_khdh;
+  const Gd_khdh = '0201';
   try {
     const WorkListdata = await WorkList({ Gd_khdh:Gd_khdh});//接口调用函数
     tableData.splice(0,tableData.length,...WorkListdata.data);//表格数据
@@ -427,19 +435,12 @@ const gytableData = ref([])
 const bomtableData = ref([])
 const tableRowClick = async (row) => {
   const Gd_gdbh = row.工单编号;
-  // console.log(row);
   const yjres = await Printed({ Gd_gdbh:Gd_gdbh});
   const gyres = await Craft({ Gd_gdbh:Gd_gdbh });
   const bomres = await Bom({ Gd_gdbh:Gd_gdbh});
   yjtableData.value = yjres.data;
   gytableData.value = gyres.data;
   bomtableData.value = bomres.data;
-  // yjtableData.splice(0,yjtableData.length,...yjres.data);//表格数据
-  // gytableData.splice(0,gytableData.length,...gyres.data);//表格数据
-  // bomtableData.splice(0,bomtableData.length,...bomres.data);//表格数据
-  // console.log(yjres)
-  // console.log(gyres)
-  // console.log(bomres)
 };
 
 // 分页