Browse Source

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

Lexie 1 year ago
parent
commit
5a9ee95e6d

+ 7 - 1
src/view/performance/jjgzzhys.vue

@@ -42,6 +42,11 @@ import {
   staffSalaryCount,
 } from '@/api/yunyin/yunying'
 import { ElMessage } from 'element-plus'
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore()
+const _username = ref('')
+_username.value = userStore.userInfo.userName + '/' + userStore.userInfo.nickName
+
 const form = reactive({})
 const visible = ref(true)
 const jjgzzhysformData = reactive({
@@ -53,6 +58,7 @@ const jjgzzhysformData = reactive({
   vacation_two_start: '',
   vacation_two_end: '',
 });
+
 //=============页面默认加载获取=========
 // 获取当前日期
 const currentDate = new Date();
@@ -101,7 +107,7 @@ const jjgzzhysclick = async () => {
     return `${year}-${month}-${day}`;
   }
   const formattedData = {
-    sys_id: "[0001/测试]",
+    sys_id: _username.value,
     date: jjgzzhysformData.date,
     start_date: formatDate(jjgzzhysformData.start_date),
     end_date: formatDate(jjgzzhysformData.end_date),

+ 11 - 9
src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -1599,7 +1599,10 @@ import {
   annexDel,
 } from '@/api/yunyin/yunying'
 defineOptions({   name: 'Company'})
-
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore()
+const _username = ref('')
+_username.value = userStore.userInfo.userName + '/' + userStore.userInfo.nickName
 // =========== 导出Excel表格 ===========
 // //导出产品
 // const cpdialogexportToExcel = ref(false)
@@ -2777,7 +2780,7 @@ const add_gdyjenterDialog = () => {
     yj_ks: add_yjzlformdata['ks'],
     yj_ls: add_yjzlformdata['ls'],
     yj_desc: add_yjzlformdata['desc'],
-    sys_id  : "[1020/邢醉育]",
+    sys_id  : _username.value,
     // 万小张: add_yjzlformdata['万小张'],
   };
   console.log(formattedData)
@@ -2855,7 +2858,7 @@ const add_gyformData = reactive({
   工序备注: '',
   质量要求: '',
   质量隐患: '',
-  Sys_id: '',
+  Sys_id: _username.value,
   标准损耗2:'',
 });
 const getcjmc = (code) => {
@@ -2968,7 +2971,7 @@ const addgyenterDialog = () => {
     工序备注:add_gyformData['工序备注'],
     质量要求: add_gyformData['质量要求'],
     质量隐患: add_gyformData['质量隐患'],
-    Sys_id  : "[1020/邢醉育]",
+    Sys_id  : _username.value,
     // 万小张: add_yjzlformdata['万小张'],
   };
   console.log(formattedData)
@@ -3045,12 +3048,11 @@ const addtbenterDialog = async () => {
     YB_gxh: add_ybformDataTest.YB_gxh,
     存货编码: add_ybformDataTest.物料代码,
     印版名称: add_ybformDataTest.物料名称,
-    Sys_id: '[1016/邹训敏]',
+    Sys_id: _username.value,
     // 印版备注: add_ybformDataTest.ybbz,
   };
-  // console.log(formattedData)
+  console.log(formattedData)
   const addProductYbInfo_add = await addProductYbInfo(formattedData);
-  console.log(addProductYbInfo_add)
   if(addProductYbInfo_add.code === 0) {
     ElMessage({type: 'success',message: '更新成功'})
     addybdialogFormVisible.value = false;
@@ -3320,7 +3322,7 @@ const jsfjClick = () => {
 //技术附件弹窗
 const jsfjdialogFormVisible = ref(false)
 const jsfjformdata = ref({
-	sys_id: '[272/超级用户]',
+	sys_id: _username.value,
 	序号: '',
 	附件备注: '',
 	附件内容: '',
@@ -3331,7 +3333,7 @@ const jsfjformdata = ref({
 //技术附件弹窗取消
 const initJsfjformdata = () => {
   jsfjformdata.value = {
-	sys_id: '[272/超级用户]',
+	sys_id: _username.value,
 	序号: '',
 	附件备注: '',
 	附件内容: '',

+ 49 - 5
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -115,6 +115,7 @@
             <div style=" padding: 0px; align-items: center;">
               <el-form-item label="工单编号" prop="processName" class="mab">
                 <el-input v-model="yycpzlformData['gdbh']" ref="fanganRef" @click="yycpzlProductValue({ code: 'Tab'})" @keydown="yycpzlProductValue" style="width: 23%;" />
+                <el-button type="primary" @click="yycppshuaxin_click" style="margin-left: 10px">刷新</el-button>
               </el-form-item>
               <el-form-item label="客户代号" prop="processName" class="mab">
                 <el-input v-model="yycpzlformData['khdh']" disabled style="width: 23%;" />
@@ -138,8 +139,35 @@
               <el-button @click="yycpzlhandleCancel">放弃</el-button>
               <el-button type="primary" @click="yycpzlhandleConfirm">执行</el-button>
             </div>
+            <el-table ref="multipleTable"
+                                            :show-overflow-tooltip="true"
+                                            :row-style="{ height: '0px' }"
+                                            :cell-style="{ padding: '0px' }"
+                                            :header-row-style="{ height: '0px' }"
+                                            :header-cell-style="{ padding: '0px' }"
+                                            @row-click="yyzltableRowClick"
+                                            highlight-current-row="true"
+                                            style="width: 100%;height: 30vh;" border tooltip-effect="dark"
+                                            :data="yyzltableData" row-key="ID">
+                            <el-table-column align="left" label="工单编号" width="100">
+                              <template v-slot="{ row }"><span>{{ row.工单编号 }}</span></template>
+                            </el-table-column>
+                            <el-table-column align="left" label="客户编号" width="100">
+                              <template v-slot="{ row }"><span>{{ row.客户编号 }}</span></template>
+                            </el-table-column>
+                            <el-table-column align="left" label="客户名称" width="120">
+                              <template v-slot="{ row }"><span>{{ row.客户名称 }}</span></template>
+                            </el-table-column>
+                            <el-table-column align="left" label="产品编号" width="100">
+                              <template v-slot="{ row }"><span>{{ row.产品编号 }}</span></template>
+                            </el-table-column>
+                            <el-table-column align="left" label="产品名称">
+                              <template v-slot="{ row }"><span>{{ row.产品名称 }}</span></template>
+                            </el-table-column>
+                          </el-table>
           </el-dialog>
 
+
           <el-dialog v-model="openFangan" title="请选择方案" style="width: 300px;" destroy-on-close>
             <el-tree
                 :data="WorkOrderDetailCopesFangan"
@@ -1302,6 +1330,10 @@ import {
 import PrintPage from './components/print.vue'
 import AddGongYi from './components/addGongYi.vue'
 defineOptions({name: 'Company'})
+import { useUserStore } from '@/pinia/modules/user'
+const userStore = useUserStore()
+const _username = ref('')
+_username.value = userStore.userInfo.userName + '/' + userStore.userInfo.nickName
 
 const printPageRef = ref()
 const addGongYiRef = ref()
@@ -2161,7 +2193,7 @@ const add_gdyjenterDialog =  async  () => {
     yj_ks: add_yjzlformdata['ks'],
     yj_ls: add_yjzlformdata['ls'],
     yj_desc: add_yjzlformdata['desc'],
-    Sys_id  : "[1031/谭鸿忠]",
+    Sys_id  : _username.value,
   };
   const PrintDetailAdd_add = await PrintDetailAdd(formattedData);
   if(PrintDetailAdd_add.code === 0) {
@@ -2722,7 +2754,7 @@ const yycpzlformData = reactive({
   fangan: 'A',
 });
 const onyycpzllist = ref(false);
-const fanganRef = ref()
+const fanganRef = ref();
 //引用产品资料【按钮】
 const onyycpzlclick = () => {
   if(_Gd_gdbh.value == null){
@@ -2746,7 +2778,6 @@ const yycpzlProductValue = async (e) => {
   }
 };
 
-const yyzltableData = ref([]);
 const WorkOrderDetailCopesFangan = ref([])
 const defaultSelectionFangan = ref()
 //引用产品资料->获取产品资料
@@ -2775,6 +2806,19 @@ const _WorkOrderDetailCopedata = async ()=>{
   }
 }
 
+const yyzltableData = ref([]);
+const yycppshuaxin_click = async ()=>{
+  let search = yycpzlformData['gdbh'];
+  console.log(search)
+  const WorkOrderDetailCope_table = await WorkOrderDetailCope({search:search});
+  console.log(WorkOrderDetailCope_table)
+  yyzltableData.value = WorkOrderDetailCope_table.data
+}
+const yyzltableRowClick = async (row)=>{
+  yycpzlformData['gdbh'] = row['工单编号'];
+  _WorkOrderDetailCopedata();
+}
+
 const setFangan = (node) => {
   yycpzlformData['fangan'] = node['方案']
   defaultSelectionFangan.value = node['方案']
@@ -3598,7 +3642,7 @@ const jsfjClick = () => {
 //技术附件弹窗
 const jsfjdialogFormVisible = ref(false)
 const jsfjformdata = ref({
-	sys_id: '[272/超级用户]',
+	sys_id: _username.value,
 	附件备注: '',
 	附件内容: '',
 	附件类型: '',
@@ -3607,7 +3651,7 @@ const jsfjformdata = ref({
 //技术附件弹窗取消
 const initJsfjformdata = () => {
   jsfjformdata.value = {
-	sys_id: '[272/超级用户]',
+	sys_id: _username.value,
 	附件备注: '',
 	附件内容: '',
 	附件类型: '',