|
|
@@ -721,9 +721,9 @@
|
|
|
|
|
|
<el-tab-pane label="技术资料附件" @click="showTable('技术资料附件')" name="fourth">
|
|
|
<div id="luckyexcel" style="width: 100%;height: 40vh;"></div>
|
|
|
- </el-tab-pane>
|
|
|
- <el-button type="primary" class="bt" @click="ExcelShow()" >Excel</el-button>
|
|
|
-
|
|
|
+ </el-tab-pane>
|
|
|
+ <el-button type="primary" class="bt" @click="ExcelShow()" >Excel</el-button>
|
|
|
+
|
|
|
</el-tabs>
|
|
|
|
|
|
<!-- 修改产品产品基本资料表格弹窗 -->
|
|
|
@@ -1162,31 +1162,31 @@
|
|
|
<el-form :model="gyformDataTest" label-position="right" ref="elFormRef" :rules="rule" >
|
|
|
<el-row>
|
|
|
<el-form-item label="工序方案:" prop="address" class="mab" >
|
|
|
- <el-input v-model="add_gyformData.Gy0_方案" placeholder="" style="width: 90px;" id="方案" @keydown="ent($event, '备注', '方案', '加工开数')"/>
|
|
|
+ <el-input v-model="add_gyformData.Gy0_方案" placeholder="" style="width: 90px;" id="Gy0_方案" @keydown="add_cpgyent($event, '质量隐患', 'Gy0_方案', 'Gy0_cpdh')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="印件编号:" prop="address" class="mab" label-width="90">
|
|
|
- <el-input v-model="add_gyformData.Gy0_cpdh" placeholder="" style="width: 90px;" id="Gy0_yjno"/>
|
|
|
+ <el-input v-model="add_gyformData.Gy0_cpdh" placeholder="" style="width: 90px;" id="Gy0_cpdh" @keydown="add_cpgyent($event, 'Gy0_方案', 'Gy0_cpdh', 'Gy0_gxh')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="工序编号:" prop="address" class="mab" >
|
|
|
- <el-input v-model="add_gyformData.Gy0_gxh" placeholder="" style="width: 90px;" id="Gy0_gxh" />
|
|
|
+ <el-input v-model="add_gyformData.Gy0_gxh" placeholder="" style="width: 90px;" id="Gy0_gxh" @keydown="add_cpgyent($event, 'Gy0_cpdh', 'Gy0_gxh', 'Gy0_Ks')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="加工开数" prop="address" class="mab">
|
|
|
- <el-input v-model="add_gyformData.Gy0_Ks" placeholder="" style="width: 90px;" id="加工开数" @keydown="ent($event, 'Gy0_gxh', '加工开数', 'Gy0_ls')"/>
|
|
|
+ <el-input v-model="add_gyformData.Gy0_Ks" placeholder="" style="width: 90px;" id="Gy0_Ks" @keydown="add_cpgyent($event, 'Gy0_gxh', 'Gy0_Ks', 'Gy0_ls')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="加工联数:" prop="address" class="mab" >
|
|
|
- <el-input v-model="add_gyformData.Gy0_ls" placeholder="" style="width: 90px;" id="Gy0_ls" @keydown="ent($event, '加工开数', 'Gy0_ls', 'gy0_site')"/>
|
|
|
+ <el-input v-model="add_gyformData.Gy0_ls" placeholder="" style="width: 90px;" id="Gy0_ls" @keydown="add_cpgyent($event, 'Gy0_Ks', 'Gy0_ls', '车间名称')"/>
|
|
|
</el-form-item>
|
|
|
</el-row>
|
|
|
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="车间名称:" prop="address" class="mab">
|
|
|
- <el-input v-model="add_gyformData.Gy0_site" @keyup.enter="getcjmc()" placeholder="" style="width: 140px;" id="gy0_site" />
|
|
|
+ <el-input v-model="add_gyformData.Gy0_site" placeholder="" style="width: 140px;" id="车间名称" @keydown="add_cpgyent($event, 'Gy0_ls', '车间名称', 'add_gxmc')" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="工艺名称:" prop="address" class="mab" label-width="100">
|
|
|
- <el-input v-model="add_gyformData.Add_gxmc" placeholder="" style="width: 140px;" id="gy0_gxmc" @keydown="ent($event, 'gy0_site', 'gy0_gxmc', 'add_gxmc')"/>
|
|
|
+ <el-input v-model="add_gyformData.Add_gxmc" placeholder="" style="width: 140px;" id="gy0_gxmc" @keydown="add_cpgyent($event, '车间名称', 'gy0_gxmc', 'add_gxmc')"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -1194,53 +1194,53 @@
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="工序名称:" prop="address" class="mab">
|
|
|
- <el-input v-model="add_gyformData.gy0_gxmc" placeholder="" style="width: 100%;" id="add_gxmc" @keydown="ent($event, 'gy0_gxmc', 'add_gxmc', 'Gy0_sbbh')"/>
|
|
|
+ <el-input v-model="add_gyformData.gy0_gxmc" placeholder="" style="width: 100%;" id="add_gxmc" @keydown="add_cpgyent($event, 'gy0_gxmc', 'add_gxmc', 'Gy0_Ms')"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
<el-row>
|
|
|
<el-form-item label="计损色数:" prop="address" class="mab">
|
|
|
- <el-input v-model="add_gyformData.Gy0_Ms" placeholder="" style="width: 140px;" id="Gy0_sbbh" @keydown="ent($event, 'add_gxmc', 'Gy0_sbbh', 'sys_mc')"/>
|
|
|
+ <el-input v-model="add_gyformData.Gy0_Ms" placeholder="" style="width: 140px;" id="Gy0_Ms" @keydown="add_cpgyent($event, 'add_gxmc', 'Gy0_Ms', '可用设备')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="可用设备:" prop="address" class="mab" label-width="100">
|
|
|
- <el-input v-model="add_gyformData.Gy0_sbbh" placeholder="" style="" id="可用设备" />
|
|
|
+ <el-input v-model="add_gyformData.Gy0_sbbh" placeholder="" style="" id="可用设备" @keydown="add_cpgyent($event, 'Gy0_Ms', '可用设备', '难度系数')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="难度系数:" prop="address" class="mab" label-width="237">
|
|
|
- <el-input v-model="add_gyformData.难度系数" placeholder="" style="width: 90px;" id="工价系数" />
|
|
|
+ <el-input v-model="add_gyformData.难度系数" placeholder="" style="width: 90px;" id="难度系数" @keydown="add_cpgyent($event, '可用设备', '难度系数', '标准损耗')"/>
|
|
|
</el-form-item>
|
|
|
</el-row>
|
|
|
|
|
|
<el-row>
|
|
|
<el-form-item label="标准损耗:" prop="address" class="mab">
|
|
|
- <el-input v-model="add_gyformData.标准损耗" @keyup.enter="getSH()" placeholder="" style="width: 150px;" id="Gy0_shdh" />
|
|
|
- <el-input v-model="add_gyformData.标准损耗2" placeholder="" style="width: 160px;" id="sys_mc" @keydown="ent($event, 'Gy0_sbbh', 'sys_mc', '基础损耗')"/>
|
|
|
+ <el-input v-model="add_gyformData.标准损耗" @keyup.enter="getSH()" placeholder="" style="width: 150px;" id="标准损耗" @keydown="add_cpgyent($event, '难度系数', '标准损耗', '标准损耗2')"/>
|
|
|
+ <el-input v-model="add_gyformData.标准损耗2" placeholder="" style="width: 160px;" id="标准损耗2" @keydown="add_cpgyent($event, '标准损耗', '标准损耗2', '基础损耗')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="基础损耗:" prop="address" class="mab">
|
|
|
- <el-input v-model="add_gyformData.Gy0_shdh" placeholder="" style="width: 70px;" id="基础损耗" @keydown="ent($event, 'sys_mc', '基础损耗', '损耗率')"/>
|
|
|
+ <el-input v-model="add_gyformData.Gy0_shdh" placeholder="" style="width: 70px;" id="基础损耗" @keydown="add_cpgyent($event, '标准损耗2', '基础损耗', '损耗率')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="损耗率" prop="address" class="mab" >
|
|
|
- <el-input v-model="add_gyformData.损耗率" placeholder="" style="width: 90px;" id="损耗率" @keydown="ent($event, '基础损耗', '损耗率', '工序备注')"/>
|
|
|
+ <el-input v-model="add_gyformData.损耗率" placeholder="" style="width: 90px;" id="损耗率" @keydown="add_cpgyent($event, '基础损耗', '损耗率', '损耗系数')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="损耗系数:" prop="address" class="mab" >
|
|
|
- <el-input v-model="add_gyformData.损耗系数" placeholder="" style="width: 90px;" id="损耗系数"/>
|
|
|
+ <el-input v-model="add_gyformData.损耗系数" placeholder="" style="width: 90px;" id="损耗系数" @keydown="add_cpgyent($event, '损耗率', '损耗系数', '工序备注')"/>
|
|
|
</el-form-item>
|
|
|
</el-row>
|
|
|
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="工序备注:" prop="remark" class="mab">
|
|
|
- <el-input type="textarea" v-model="add_gyformData.工序备注" rows="2" resize="none" placeholder="" id="工序备注" @keydown="ent($event, '损耗率', '工序备注', '质量要求')" />
|
|
|
+ <el-input type="textarea" v-model="add_gyformData.工序备注" rows="2" resize="none" placeholder="" id="工序备注" @keydown="add_cpgyent($event, '损耗系数', '工序备注', '质量要求')" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="质量要求:" prop="remark" class="mab">
|
|
|
- <el-input type="textarea" v-model="add_gyformData.质量要求" rows="2" resize="none" placeholder="" id="质量要求" @keydown="ent($event, '工序备注', '质量要求', '质量隐患')" />
|
|
|
+ <el-input type="textarea" v-model="add_gyformData.质量要求" rows="2" resize="none" placeholder="" id="质量要求" @keydown="add_cpgyent($event, '工序备注', '质量要求', '质量隐患')" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="质量隐患:" prop="remark" class="mab">
|
|
|
- <el-input type="textarea" v-model="add_gyformData.质量隐患" rows="2" resize="none" placeholder="" id="质量隐患" @keydown="ent($event, '质量要求', '质量隐患', '方案')" />
|
|
|
+ <el-input type="textarea" v-model="add_gyformData.质量隐患" rows="2" resize="none" placeholder="" id="质量隐患" @keydown="add_cpgyent($event, '质量要求', '质量隐患', 'Gy0_方案')" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -1259,12 +1259,6 @@
|
|
|
<el-dialog v-model="searchCJModel" :before-close="() => searchCJModel = false">
|
|
|
<el-form>
|
|
|
<div>
|
|
|
- <!-- <el-form-item label="关键字:" class="mab" prop="keyOrder">
|
|
|
- <el-space>
|
|
|
- <el-input v-model="gymc_keyword" style="width: 100%;"/>
|
|
|
- <el-button @click="searchHandle(gymc_keyword)">刷新</el-button>
|
|
|
- </el-space>
|
|
|
- </el-form-item> -->
|
|
|
<div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
|
|
|
<el-tree :data="getCJListdata" :props="defaultProps" @node-click="selectCJNode" />
|
|
|
</div>
|
|
|
@@ -1273,18 +1267,18 @@
|
|
|
</el-form>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <!-- 工序损耗列表-->
|
|
|
- <el-dialog v-model="gxshdisplay" :before-close="()=> gxshdisplay = false" style="width: 800px;" :title="'工序损耗'" destroy-on-close>
|
|
|
- <el-tree
|
|
|
- :data="gxshList"
|
|
|
- :render-after-expand="false"
|
|
|
- @node-click="gxshselectHandle"
|
|
|
- :props="{children: 'children',label: 'label', value: 'value'}"
|
|
|
- style="border: 1px solid #ececec; padding: 10px;height: 400px;overflow: auto;"
|
|
|
- node-key="value"
|
|
|
- :default-expanded-keys="add_gyformData.Gy0_site"
|
|
|
- >
|
|
|
- </el-tree>
|
|
|
+ <!-- 工序损耗列表-->
|
|
|
+ <el-dialog v-model="gxshdisplay" :before-close="()=> gxshdisplay = false" style="width: 800px;" :title="'工序损耗'" destroy-on-close>
|
|
|
+ <el-tree
|
|
|
+ :data="gxshList"
|
|
|
+ :render-after-expand="false"
|
|
|
+ @node-click="gxshselectHandle"
|
|
|
+ :props="{children: 'children',label: 'label', value: 'value'}"
|
|
|
+ style="border: 1px solid #ececec; padding: 10px;height: 400px;overflow: auto;"
|
|
|
+ node-key="value"
|
|
|
+ :default-expanded-keys="add_gyformData.Gy0_site"
|
|
|
+ >
|
|
|
+ </el-tree>
|
|
|
</el-dialog>
|
|
|
|
|
|
<!-- 修改印版资料 弹窗 -->
|
|
|
@@ -1477,7 +1471,7 @@ export default {
|
|
|
</script>
|
|
|
<script setup>
|
|
|
// 全量引入格式化工具 请按需保留
|
|
|
-import $script from 'scriptjs'
|
|
|
+import $script from 'scriptjs'
|
|
|
import $ from 'jquery';
|
|
|
import LuckyExcel from 'luckyexcel';
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
|
|
@@ -1515,8 +1509,8 @@ import {
|
|
|
copyProductGy,
|
|
|
getProductYbMaterialList,
|
|
|
getProductYbInfo,
|
|
|
- addProductYbInfo,
|
|
|
- getExcelInfo,
|
|
|
+ addProductYbInfo,
|
|
|
+ getExcelInfo,
|
|
|
WastageList,
|
|
|
} from '@/api/yunyin/yunying'
|
|
|
defineOptions({ name: 'Company'})
|
|
|
@@ -2388,7 +2382,7 @@ const tableRowClick = async (row) => {
|
|
|
console.log(ybtableData.length, ...res.data.ybData)
|
|
|
yjtableData.splice(0, yjtableData.length, ...res.data.yjData);
|
|
|
gytableData.splice(0, gytableData.length, ...res.data.gyData);
|
|
|
- ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
|
|
|
+ ybtableData.splice(0, ybtableData.length, ...res.data.ybData);
|
|
|
ExcelShow()
|
|
|
if(yjtableData.length==0){
|
|
|
yjzuidahaoma.value = 1
|
|
|
@@ -2715,7 +2709,7 @@ const add_dyjcloseDialog = () => {
|
|
|
const add_yinjian_ent = (event,id1,id2,id3) => {
|
|
|
if (id2 === '印件代号' && event.key==='Tab' || event.key==='Enter') {
|
|
|
_getProductYjList(add_yjzlformdata['yjdh']);
|
|
|
- searchModel.value = true
|
|
|
+ searchModel.value = true
|
|
|
}
|
|
|
if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
|
|
|
if(id3!=''){
|
|
|
@@ -2751,13 +2745,12 @@ const add_yinjian_ent = (event,id1,id2,id3) => {
|
|
|
const addgydialogFormVisible = ref(false)
|
|
|
const searchCJModel = ref(false)
|
|
|
const searchSHModel = ref(false)
|
|
|
-const gxshdisplay = ref(false)
|
|
|
+const gxshdisplay = ref(false)
|
|
|
const gxshList = ref([])
|
|
|
-const addcpgy_onclick = () => {
|
|
|
- addgydialogFormVisible.value=true
|
|
|
- // add_yjdialogFormVisible.value = true
|
|
|
- // console.log(yjtableData.length)
|
|
|
-}
|
|
|
+const getCJListdata = ref([]);
|
|
|
+const getSHListdata = ref([]);
|
|
|
+
|
|
|
+//新增表单字段
|
|
|
const add_gyformData = reactive({
|
|
|
Gy0_方案: '',
|
|
|
Gy0_cpdh: '',
|
|
|
@@ -2772,25 +2765,30 @@ const add_gyformData = reactive({
|
|
|
Gy0_sbbh: '',
|
|
|
Gy0_shdh: '',
|
|
|
工价系数: '',
|
|
|
- 难度系数:'1.000',
|
|
|
- 损耗率:'0.00140',
|
|
|
- 损耗系数: '1.000',
|
|
|
+ 难度系数:'',
|
|
|
+ 损耗率:'',
|
|
|
+ 损耗系数: '',
|
|
|
工序备注: '',
|
|
|
质量要求: '',
|
|
|
质量隐患: '',
|
|
|
Sys_id: '',
|
|
|
标准损耗2:'',
|
|
|
});
|
|
|
-const getcjmc = (code) => {
|
|
|
- // if (code.key==='Tab') {
|
|
|
- // setTimeout(() =>document.querySelector('#yjdhId').focus(), 50)
|
|
|
- // _getCJList();
|
|
|
|
|
|
- // }
|
|
|
- _getCJList()
|
|
|
+//清空对象的属性值
|
|
|
+const cpgy_clearFormData = () => {
|
|
|
+ Object.keys(add_gyformData).forEach(key => {
|
|
|
+ add_gyformData[key] = '';
|
|
|
+ });
|
|
|
+};
|
|
|
+
|
|
|
+//点击新增工艺资料按钮
|
|
|
+const addcpgy_onclick = () => {
|
|
|
+ cpgy_clearFormData();
|
|
|
+ addgydialogFormVisible.value=true
|
|
|
}
|
|
|
|
|
|
-const getCJListdata = ref([]);
|
|
|
+//3.7工艺资料-获取车间及工艺名称
|
|
|
const _getCJList = async () => {
|
|
|
try {
|
|
|
const response = await getDepartName({ search: '' });
|
|
|
@@ -2816,13 +2814,10 @@ const _getCJList = async () => {
|
|
|
} catch (error) {
|
|
|
console.error(error);
|
|
|
}
|
|
|
-};
|
|
|
-
|
|
|
+};
|
|
|
+//点击车间名称列表数据
|
|
|
const selectCJNode = (nodeData) => {
|
|
|
- console.log(nodeData.level)
|
|
|
-
|
|
|
if(nodeData.level==2){
|
|
|
- console.log(nodeData.label)
|
|
|
add_gyformData.Gy0_site=nodeData.label
|
|
|
}
|
|
|
if(nodeData.level==3){
|
|
|
@@ -2831,70 +2826,36 @@ const selectCJNode = (nodeData) => {
|
|
|
searchCJModel.value = false
|
|
|
}
|
|
|
}
|
|
|
-const getSHListdata = ref([]);
|
|
|
-const getSH = (code) => {
|
|
|
- _getSH()
|
|
|
-}
|
|
|
+
|
|
|
+//工艺资料添加->工序损耗代码
|
|
|
const _getSH = async () => {
|
|
|
- // const response = await getProcessLoss({search:add_gyformData.标准损耗});
|
|
|
- // // getSHListdata.value = processData(response.data);
|
|
|
- // // searchSHModel.value = true
|
|
|
- // console.log(response.data[0].sys_mc)
|
|
|
- // add_gyformData.标准损耗2=response.data[0].sys_mc
|
|
|
- // console.log(getSHListdata.value);
|
|
|
- const WastageList_data = await WastageList({search: add_gyformData.Gy0_site})
|
|
|
- gxshList.value = [{
|
|
|
- label: add_gyformData.Gy0_site,
|
|
|
- value: add_gyformData.Gy0_site,
|
|
|
- children: []
|
|
|
- }]
|
|
|
- if (WastageList_data.data.length === 0) {add_gyformData.标准损耗 = "";add_gyformData.标准损耗2 = "";}
|
|
|
- if (WastageList_data.data.length > 1) {
|
|
|
- gxshdisplay.value = true
|
|
|
- gxshList.value[0].children = WastageList_data.data.map(item => {
|
|
|
- return { label: `${item.编号} - ${item.名称}`, label2: item.名称, UniqId: item.UniqId, value: item.编号 }
|
|
|
- })
|
|
|
- } else {
|
|
|
- add_gyformData.标准损耗 = WastageList_data.data[0].编号;
|
|
|
- add_gyformData.标准损耗2 = WastageList_data.data[0].名称;
|
|
|
- }
|
|
|
-};
|
|
|
-//点击工序损耗列表数据
|
|
|
-const gxshselectHandle = async (node)=>{
|
|
|
- if(node.label2){
|
|
|
- add_gyformData.标准损耗 = node.value
|
|
|
- add_gyformData.标准损耗2 = node.label2
|
|
|
- gxshdisplay.value = false
|
|
|
- }
|
|
|
-}
|
|
|
-// const processData = (data) => {
|
|
|
-// const map = {};
|
|
|
-// const tree = [];
|
|
|
-// console.log(data)
|
|
|
-// data.forEach(item => {
|
|
|
-// map[item.sys_bh] = { label: `${item.sys_bh} ${item.sys_mc}`, level: 1, children: [] };
|
|
|
-
|
|
|
-// });
|
|
|
-
|
|
|
-
|
|
|
-// data.forEach(item => {
|
|
|
-// if (item.Parent !== "0_") {
|
|
|
-// map[item.Parent].children.push(map[item.sys_bh]); console.log(item) }
|
|
|
-// // } else {
|
|
|
-// // tree.push(map[item.sys_bh]);
|
|
|
-// // console.log(item)
|
|
|
-// // }
|
|
|
-// });
|
|
|
-
|
|
|
-// tree.forEach(item => {
|
|
|
-// // console.log(item)
|
|
|
-// // if (item.children.length === 0) {
|
|
|
-// // item.children.push({ label: `${item.sys_bh} ${item.sys_mc}`, level: 2 });
|
|
|
-// // }
|
|
|
-// });
|
|
|
-
|
|
|
-// return tree;
|
|
|
-// };
|
|
|
+ const WastageList_data = await WastageList({search: add_gyformData.Gy0_site})
|
|
|
+ gxshList.value = [{
|
|
|
+ label: add_gyformData.Gy0_site,
|
|
|
+ value: add_gyformData.Gy0_site,
|
|
|
+ children: []
|
|
|
+ }]
|
|
|
+ if (WastageList_data.data.length === 0) {add_gyformData.标准损耗 = "";add_gyformData.标准损耗2 = "";}
|
|
|
+ if (WastageList_data.data.length > 1) {
|
|
|
+ gxshdisplay.value = true
|
|
|
+ gxshList.value[0].children = WastageList_data.data.map(item => {
|
|
|
+ return { label: `${item.编号} - ${item.名称}`, label2: item.名称, UniqId: item.UniqId, value: item.编号 }
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ add_gyformData.标准损耗 = WastageList_data.data[0].编号;
|
|
|
+ add_gyformData.标准损耗2 = WastageList_data.data[0].名称;
|
|
|
+ }
|
|
|
+};
|
|
|
+
|
|
|
+//点击工序损耗列表数据
|
|
|
+const gxshselectHandle = async (node)=>{
|
|
|
+ if(node.label2){
|
|
|
+ add_gyformData.标准损耗 = node.value
|
|
|
+ add_gyformData.标准损耗2 = node.label2
|
|
|
+ gxshdisplay.value = false
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
//工艺新增确定
|
|
|
const addgyenterDialog = () => {
|
|
|
console.log(add_yjzlformdata)
|
|
|
@@ -2919,20 +2880,63 @@ const addgyenterDialog = () => {
|
|
|
Sys_id : "[1020/邢醉育]",
|
|
|
// 万小张: add_yjzlformdata['万小张'],
|
|
|
};
|
|
|
- console.log(formattedData)
|
|
|
- const res=addProductGyInfo(formattedData)
|
|
|
- console.log(res)
|
|
|
- if(res.code==0){
|
|
|
-
|
|
|
- }else{
|
|
|
-
|
|
|
- }
|
|
|
- addgydialogFormVisible.value = false
|
|
|
+ console.log(formattedData);
|
|
|
+ const res=addProductGyInfo(formattedData)
|
|
|
+ res.then(response => {
|
|
|
+ const code = response.code;
|
|
|
+ console.log(code); // This will log the value of the 'code' property from the response
|
|
|
+ if(code === 0) {
|
|
|
+ ElMessage({type: 'success',message: '添加成功'})
|
|
|
+ // addgydialogFormVisible.value = false
|
|
|
+ // console.log('111')
|
|
|
+ } else {
|
|
|
+ ElMessage({type: 'error',message: '添加失败' })
|
|
|
+ // console.log('222')
|
|
|
+ // console.log(res.code)
|
|
|
+ // console.log(res)
|
|
|
+ }
|
|
|
+ });return
|
|
|
+
|
|
|
}
|
|
|
+
|
|
|
//工艺新增取消
|
|
|
const addgycloseDialog = () => {
|
|
|
addgydialogFormVisible.value = false
|
|
|
}
|
|
|
+
|
|
|
+//新增工艺资料键盘 input框跳转
|
|
|
+const add_cpgyent = (event,id1,id2,id3) => {
|
|
|
+ if (id2 === '车间名称' && event.key==='Tab' || id2 === '车间名称' && event.key=== 'Enter') {
|
|
|
+ _getCJList();
|
|
|
+ }
|
|
|
+ if (id2 === '标准损耗' && event.key==='Tab' || id2 === '标准损耗' && event.key=== 'Enter') {
|
|
|
+ _getSH();
|
|
|
+ }
|
|
|
+ if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
|
|
|
+ if(id3!=''){
|
|
|
+ document.getElementById(id3).focus()
|
|
|
+ }
|
|
|
+ } else if (event.keyCode === 38) { // 向上箭头
|
|
|
+ if(id1!=''){
|
|
|
+ document.getElementById(id1).focus()
|
|
|
+ }
|
|
|
+ }else if (event.keyCode === 8) { // 删除箭头
|
|
|
+ if(id1!='' && document.getElementById(id2).value==''){
|
|
|
+ document.getElementById(id1).focus()
|
|
|
+ }
|
|
|
+ console.log(document.getElementById(id2).value)
|
|
|
+ }else if (event.keyCode === 37) { // 向左箭头
|
|
|
+ if(id1!='' && document.getElementById(id2).selectionStart==0){
|
|
|
+ document.getElementById(id1).focus()
|
|
|
+ }
|
|
|
+ }else if (event.keyCode === 39) { // 向右箭头
|
|
|
+ if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
|
|
|
+ document.getElementById(id3).focus()
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
//=========新增印版资料========
|
|
|
const addybdialogFormVisible = ref(false)
|
|
|
const addybdisplay = ref(false)
|
|
|
@@ -3188,32 +3192,7 @@ const setInputCellStyle = (data) => {
|
|
|
return style
|
|
|
}
|
|
|
|
|
|
-//键盘 input框跳转
|
|
|
-const ent = (event,id1,id2,id3) => {
|
|
|
|
|
|
- if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
|
|
|
- if(id3!=''){
|
|
|
- document.getElementById(id3).focus()
|
|
|
- }
|
|
|
- } else if (event.keyCode === 38) { // 向上箭头
|
|
|
- if(id1!=''){
|
|
|
- document.getElementById(id1).focus()
|
|
|
- }
|
|
|
- }else if (event.keyCode === 8) { // 删除箭头
|
|
|
- if(id1!='' && document.getElementById(id2).value==''){
|
|
|
- document.getElementById(id1).focus()
|
|
|
- }
|
|
|
- console.log(document.getElementById(id2).value)
|
|
|
- }else if (event.keyCode === 37) { // 向左箭头
|
|
|
- if(id1!='' && document.getElementById(id2).selectionStart==0){
|
|
|
- document.getElementById(id1).focus()
|
|
|
- }
|
|
|
- }else if (event.keyCode === 39) { // 向右箭头
|
|
|
- if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
|
|
|
- document.getElementById(id3).focus()
|
|
|
- }
|
|
|
- }
|
|
|
-}
|
|
|
|
|
|
// const _yjdh = ref(null);
|
|
|
const yj_ent = (event,id1,id2,id3) => {
|
|
|
@@ -3252,82 +3231,82 @@ const tableDataCellClass = ({row, column, rowIndex, columnIndex}) =>{
|
|
|
if (column.property === 'gyData' || column.property === 'yjData') {
|
|
|
return 'plan-usage-low';
|
|
|
}
|
|
|
-}
|
|
|
-
|
|
|
-//技术资料excel展示
|
|
|
-const ExcelShow = () =>{
|
|
|
- $.getScript('/luckysheet/plugins/js/plugin.js', () => {
|
|
|
- $script('/luckysheet/luckysheet.umd.js', () => {
|
|
|
- fetch('/luckysheet/黄金叶(软大金圆)(二维码版).xlsx')
|
|
|
- .then(response => response.blob())
|
|
|
- .then(blob => {
|
|
|
-
|
|
|
- const file = new File([blob], 'filename.xlsx', { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
|
|
|
- createROLuckyExcel(file);
|
|
|
- });
|
|
|
- })
|
|
|
- })
|
|
|
- $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/css/pluginsCss.css'));
|
|
|
- $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/plugins.css'));
|
|
|
- $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/css/luckysheet.css'));
|
|
|
- $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/assets/iconfont/iconfont.css'));
|
|
|
-
|
|
|
-}
|
|
|
-
|
|
|
-let luckyExcel = null
|
|
|
+}
|
|
|
+
|
|
|
+//技术资料excel展示
|
|
|
+const ExcelShow = () =>{
|
|
|
+ $.getScript('/luckysheet/plugins/js/plugin.js', () => {
|
|
|
+ $script('/luckysheet/luckysheet.umd.js', () => {
|
|
|
+ fetch('/luckysheet/黄金叶(软大金圆)(二维码版).xlsx')
|
|
|
+ .then(response => response.blob())
|
|
|
+ .then(blob => {
|
|
|
+
|
|
|
+ const file = new File([blob], 'filename.xlsx', { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
|
|
|
+ createROLuckyExcel(file);
|
|
|
+ });
|
|
|
+ })
|
|
|
+ })
|
|
|
+ $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/css/pluginsCss.css'));
|
|
|
+ $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/plugins/plugins.css'));
|
|
|
+ $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/css/luckysheet.css'));
|
|
|
+ $('head').append($('<link rel="stylesheet" type="text/css" />').attr('href', '/luckysheet/assets/iconfont/iconfont.css'));
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
+let luckyExcel = null
|
|
|
/**
|
|
|
* 只读版luckyExcel 创建
|
|
|
*/
|
|
|
-const createROLuckyExcel = (files) => {
|
|
|
- LuckyExcel.transformExcelToLucky(files, function (exportJson, luckysheetfile) {
|
|
|
- console.log("transformExcelToLucky", files, exportJson)
|
|
|
- if (exportJson.sheets == null || exportJson.sheets.length == 0) {
|
|
|
- alert("Failed to read the content of the excel file, currently does not support xls files!");
|
|
|
- return;
|
|
|
- }
|
|
|
- if(luckyExcel) luckyExcel.destroy();
|
|
|
- nextTick(() => {
|
|
|
- $(function () {
|
|
|
- luckysheet.create({
|
|
|
- container: 'luckyexcel', //容器的ID
|
|
|
- data: exportJson.sheets,
|
|
|
- title: exportJson.info.name, // 工作簿名称
|
|
|
- lang: "zh", // 设定表格语言 国际化设置,允许设置表格的语言,支持中文("zh")和英文("en")
|
|
|
- // allowCopy: false, // 是否允许拷贝
|
|
|
- showtoolbar: false, // 是否显示工具栏
|
|
|
- showinfobar: false, // 是否显示顶部信息栏
|
|
|
- // showsheetbar: false, // 是否显示底部sheet页按钮
|
|
|
- // showstatisticBar: false, // 是否显示底部计数栏
|
|
|
- // sheetBottomConfig: false, // sheet页下方的添加行按钮和回到顶部按钮配置
|
|
|
- allowEdit: false, // 是否允许前台编辑
|
|
|
- enableAddRow: false, // 允许增加行
|
|
|
- enableAddCol: false, // 允许增加列
|
|
|
- userInfo: false, // 右上角的用户信息展示样式
|
|
|
- showRowBar: false, // 是否显示行号区域
|
|
|
- showColumnBar: false, // 是否显示列号区域
|
|
|
- sheetFormulaBar: false, // 是否显示公式栏
|
|
|
- enableAddBackTop: false,//返回头部按钮
|
|
|
- // rowHeaderWidth: 0,//纵坐标
|
|
|
- // columnHeaderHeight: 0,//横坐标
|
|
|
- // showstatisticBarConfig: {
|
|
|
- // count:false,
|
|
|
- // view:false,
|
|
|
- // zoom:false,
|
|
|
- // },
|
|
|
- // showsheetbarConfig: {
|
|
|
- // add: false, //新增sheet
|
|
|
- // menu: false, //sheet管理菜单
|
|
|
- // sheet: false, //sheet页显示
|
|
|
- // },
|
|
|
- // hook: {
|
|
|
- // cellMousedown:this.cellMousedown,//绑定鼠标事件
|
|
|
- // },
|
|
|
- // forceCalculation: true,//强制计算公式
|
|
|
- });
|
|
|
- luckyExcel = luckysheet;
|
|
|
- });
|
|
|
- });
|
|
|
-
|
|
|
+const createROLuckyExcel = (files) => {
|
|
|
+ LuckyExcel.transformExcelToLucky(files, function (exportJson, luckysheetfile) {
|
|
|
+ console.log("transformExcelToLucky", files, exportJson)
|
|
|
+ if (exportJson.sheets == null || exportJson.sheets.length == 0) {
|
|
|
+ alert("Failed to read the content of the excel file, currently does not support xls files!");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if(luckyExcel) luckyExcel.destroy();
|
|
|
+ nextTick(() => {
|
|
|
+ $(function () {
|
|
|
+ luckysheet.create({
|
|
|
+ container: 'luckyexcel', //容器的ID
|
|
|
+ data: exportJson.sheets,
|
|
|
+ title: exportJson.info.name, // 工作簿名称
|
|
|
+ lang: "zh", // 设定表格语言 国际化设置,允许设置表格的语言,支持中文("zh")和英文("en")
|
|
|
+ // allowCopy: false, // 是否允许拷贝
|
|
|
+ showtoolbar: false, // 是否显示工具栏
|
|
|
+ showinfobar: false, // 是否显示顶部信息栏
|
|
|
+ // showsheetbar: false, // 是否显示底部sheet页按钮
|
|
|
+ // showstatisticBar: false, // 是否显示底部计数栏
|
|
|
+ // sheetBottomConfig: false, // sheet页下方的添加行按钮和回到顶部按钮配置
|
|
|
+ allowEdit: false, // 是否允许前台编辑
|
|
|
+ enableAddRow: false, // 允许增加行
|
|
|
+ enableAddCol: false, // 允许增加列
|
|
|
+ userInfo: false, // 右上角的用户信息展示样式
|
|
|
+ showRowBar: false, // 是否显示行号区域
|
|
|
+ showColumnBar: false, // 是否显示列号区域
|
|
|
+ sheetFormulaBar: false, // 是否显示公式栏
|
|
|
+ enableAddBackTop: false,//返回头部按钮
|
|
|
+ // rowHeaderWidth: 0,//纵坐标
|
|
|
+ // columnHeaderHeight: 0,//横坐标
|
|
|
+ // showstatisticBarConfig: {
|
|
|
+ // count:false,
|
|
|
+ // view:false,
|
|
|
+ // zoom:false,
|
|
|
+ // },
|
|
|
+ // showsheetbarConfig: {
|
|
|
+ // add: false, //新增sheet
|
|
|
+ // menu: false, //sheet管理菜单
|
|
|
+ // sheet: false, //sheet页显示
|
|
|
+ // },
|
|
|
+ // hook: {
|
|
|
+ // cellMousedown:this.cellMousedown,//绑定鼠标事件
|
|
|
+ // },
|
|
|
+ // forceCalculation: true,//强制计算公式
|
|
|
+ });
|
|
|
+ luckyExcel = luckysheet;
|
|
|
+ });
|
|
|
+ });
|
|
|
+
|
|
|
})
|
|
|
}
|
|
|
</script>
|