|
|
@@ -1273,22 +1273,19 @@
|
|
|
</el-form>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <!-- 新增查询标准损耗 -->
|
|
|
- <el-dialog v-model="searchSHModel" :before-close="() => searchSHModel = 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="getSHListdata" :props="defaultProps" @node-click="selectSHNode" />
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </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>
|
|
|
|
|
|
<!-- 修改印版资料 弹窗 -->
|
|
|
<el-dialog v-model="ybdialogFormVisible" :before-close="ybcloseDialog" :title="'修改印版资料'" destroy-on-close>
|
|
|
@@ -1519,7 +1516,8 @@ import {
|
|
|
getProductYbMaterialList,
|
|
|
getProductYbInfo,
|
|
|
addProductYbInfo,
|
|
|
- getExcelInfo,
|
|
|
+ getExcelInfo,
|
|
|
+ WastageList,
|
|
|
} from '@/api/yunyin/yunying'
|
|
|
defineOptions({ name: 'Company'})
|
|
|
|
|
|
@@ -2753,7 +2751,8 @@ 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 gxshList = ref([])
|
|
|
const addcpgy_onclick = () => {
|
|
|
addgydialogFormVisible.value=true
|
|
|
// add_yjdialogFormVisible.value = true
|
|
|
@@ -2817,7 +2816,8 @@ const _getCJList = async () => {
|
|
|
} catch (error) {
|
|
|
console.error(error);
|
|
|
}
|
|
|
-};
|
|
|
+};
|
|
|
+
|
|
|
const selectCJNode = (nodeData) => {
|
|
|
console.log(nodeData.level)
|
|
|
|
|
|
@@ -2836,13 +2836,37 @@ const getSH = (code) => {
|
|
|
_getSH()
|
|
|
}
|
|
|
const _getSH = async () => {
|
|
|
- const response = await getProcessLoss({code: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 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 = [];
|