From b3f6cd3bba89f8dd64a3024fce4ec600441bcd9e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 05 九月 2023 17:30:34 +0800
Subject: [PATCH] 1.存货档案90%
---
src/views/materialManager/inventoryList.vue | 413 +++++++++++++++++++++++++++++++++------------
src/api/basicSettings.js | 53 +++++
src/api/ProductModel.js | 26 ++
src/api/GeneralBasicData.js | 8
4 files changed, 390 insertions(+), 110 deletions(-)
diff --git a/src/api/GeneralBasicData.js b/src/api/GeneralBasicData.js
index f0be394..2a93441 100644
--- a/src/api/GeneralBasicData.js
+++ b/src/api/GeneralBasicData.js
@@ -45,3 +45,11 @@
method: 'get'
})
}
+// 鍗曚綅淇℃伅鏌ヨ
+export function UnitSerch(data) {
+ return request({
+ url: 'GeneralBasicData/UnitSerch',
+ method: 'get',
+ params: data
+ })
+}
diff --git a/src/api/ProductModel.js b/src/api/ProductModel.js
index 9f59cbb..3935f3b 100644
--- a/src/api/ProductModel.js
+++ b/src/api/ProductModel.js
@@ -16,6 +16,7 @@
method: 'get'
})
}
+
// 璁￠噺鍗曚綅淇℃伅鍒楄〃
export function TUnitData(data) {
return request({
@@ -24,6 +25,7 @@
params: data
})
}
+
// 璁￠噺鍗曚綅缂栬緫鑾峰彇缁勬槑缁�
export function TUnitGroupProject(data) {
return request({
@@ -32,6 +34,7 @@
params: data
})
}
+
export function DeleteTUnit(data) {
return request({
url: 'ProductModel/DeleteTUnit',
@@ -39,6 +42,7 @@
params: data
})
}
+
// 璁￠噺鍗曚綅鏂板銆佺紪杈戜繚瀛�
export function AddUpdateTUnit(data, data_sources, tunittype, tunitgroupcode, OperType) {
return request({
@@ -47,6 +51,7 @@
data
})
}
+
// 瀛樿揣鍒嗙被淇℃伅
export function TMaterielClassTree(data) {
return request({
@@ -64,6 +69,7 @@
params: data
})
}
+
// 瀛樿揣鍒嗙被鍒犻櫎
export function TMaterielClassTreeDelete(data) {
return request({
@@ -72,6 +78,8 @@
params: data
})
}
+
+// 瀛樿揣淇℃伅鍒楄〃
export function TMaterielData(data) {
return request({
url: 'ProductModel/TMaterielData',
@@ -79,3 +87,21 @@
params: data
})
}
+
+// 瀛樿揣淇℃伅鏂板/缂栬緫淇濆瓨
+export function TMaterielAddUpdate(data) {
+ return request({
+ url: 'ProductModel/TMaterielAddUpdate',
+ method: 'post',
+ data
+ })
+}
+
+// 瀛樿揣淇℃伅鍒犻櫎
+export function TMaterielDelete(data) {
+ return request({
+ url: 'ProductModel/TMaterielDelete',
+ method: 'post',
+ params: data
+ })
+}
diff --git a/src/api/basicSettings.js b/src/api/basicSettings.js
index ddd8397..38d41b6 100644
--- a/src/api/basicSettings.js
+++ b/src/api/basicSettings.js
@@ -202,3 +202,56 @@
})
}
+// 寰�鏉ュ崟浣嶅垎绫讳俊鎭�
+export function TCunstomerClassTree(data) {
+ return request({
+ url: 'BasicSetting/TCunstomerClassTree',
+ method: 'get',
+ params: data
+ })
+}
+
+// 寰�鏉ュ崟浣嶅垎绫绘柊澧�/缂栬緫鎻愪氦
+export function TCunstomerClassTreeAddUpdate(data) {
+ return request({
+ url: 'BasicSetting/TCunstomerClassTreeAddUpdate',
+ method: 'post',
+ params: data
+ })
+}
+
+// 寰�鏉ュ崟浣嶅垎绫诲垹闄�
+export function TCunstomerClassTreeDelete(data) {
+ return request({
+ url: 'BasicSetting/TCunstomerClassTreeDelete',
+ method: 'post',
+ params: data
+ })
+}
+
+// 寰�鏉ュ崟浣嶄俊鎭垪琛�
+export function TCunstomerData(data) {
+ return request({
+ url: 'BasicSetting/TCunstomerData',
+ method: 'get',
+ params: data
+ })
+}
+
+// 寰�鏉ュ崟浣嶆柊澧�/缂栬緫淇濆瓨
+export function TCunstomerAddUpdate(data) {
+ return request({
+ url: 'BasicSetting/TCunstomerAddUpdate',
+ method: 'post',
+ data
+ })
+}
+
+// 寰�鏉ュ崟浣嶄俊鎭垹闄�
+export function TCunstomerDelete(data) {
+ return request({
+ url: 'BasicSetting/TCunstomerDelete',
+ method: 'post',
+ params: data
+ })
+}
diff --git a/src/views/materialManager/inventoryList.vue b/src/views/materialManager/inventoryList.vue
index d472ec0..7beaaf6 100644
--- a/src/views/materialManager/inventoryList.vue
+++ b/src/views/materialManager/inventoryList.vue
@@ -152,35 +152,71 @@
label="搴忓彿"
/>
<el-table-column
- prop="code"
+ prop="partcode"
label="瀛樿揣缂栫爜"
sortable="custom"
/>
<el-table-column
- prop="code"
+ prop="partname"
label="瀛樿揣鍚嶇О"
sortable="custom"
/>
<el-table-column
- prop="code"
+ prop="partspec"
label="瑙勬牸鍨嬪彿"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ {{ row.partspec?row.partspec:'/' }}
+ </template>
+ </el-table-column>
<el-table-column
- prop="code"
+ prop="idinventoryclassname"
label="鎵�灞炵被鍒�"
sortable="custom"
+ width="110"
/>
<el-table-column
- prop="code"
label="璁￠噺鍗曚綅"
+ width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ {{ row.isSingleUnit==='0'?row.idunitgroupname:row.idunitname }}
+ </template>
+ </el-table-column>
<el-table-column
- prop="code"
- label="璁￠噺鍗曚綅"
+ prop="status"
+ label="瀛樿揣鐘舵��"
+ width="110"
sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <el-tag v-if="row.status==='0'" size="small" type="success">姝ｅ父</el-tag>
+ <el-tag v-if="row.status==='1'" size="small" type="danger">鍋滅敤</el-tag>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ label="瀛樿揣灞炴��"
+ sortable="custom"
+ width="220"
+ >
+ <template slot-scope="{row}">
+ {{ row.isPurchase==='1'?'澶栬喘':'' }}
+ {{ row.isSale==='1'?'閿�鍞�':'' }}
+ {{ row.isMadeSelf==='1'?'鑷埗':'' }}
+ {{ row.isMaterial==='1'?'鐢熶骇娑堣��':'' }}
+ {{ row.isMadeRequest==='1'?'濮斿':'' }}
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鏁版嵁鏉ユ簮"
+ prop="data_sources"
+ sortable="custom"
+ width="110"
/>
+
<el-table-column
label="鎿嶄綔"
width="120"
@@ -216,7 +252,7 @@
align="right"
layout="total,prev, pager, next,sizes,jumper"
popper-class="select_bottom"
- @pagination="getOrganizationSearch"
+ @pagination="getTMaterielData($refs.treeLeftRef.getCurrentNode())"
/>
</div>
@@ -278,27 +314,27 @@
v-el-drag-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="800px"
+ width="1200px"
:close-on-click-modal="false"
top="15vh"
@closed="handleClose"
@close="handleClose"
>
- <el-form ref="dialogForm" class="elForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="110px">
+ <el-form ref="dialogForm" class="" inline :rules="dialogFormRules" :model="dialogForm" label-width="110px">
<el-divider content-position="left">鍩烘湰淇℃伅</el-divider>
- <el-form-item label="瀛樿揣缂栫爜" prop="usercode">
- <el-input v-model="dialogForm.usercode" :disabled="operation!=='add'" style="width: 200px" />
+ <el-form-item label="瀛樿揣缂栫爜" prop="partcode">
+ <el-input v-model="dialogForm.partcode" :disabled="operation!=='add'" style="width: 200px" />
</el-form-item>
- <el-form-item label="瀛樿揣鍚嶇О" prop="username">
- <el-input v-model="dialogForm.username" style="width: 200px" />
+ <el-form-item label="瀛樿揣鍚嶇О" prop="partname">
+ <el-input v-model="dialogForm.partname" style="width: 200px" />
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿">
- <el-input v-model="dialogForm.usercode" style="width: 200px" />
+ <el-input v-model="dialogForm.partspec" style="width: 200px" />
</el-form-item>
- <el-form-item label="鎵�灞炵被鍒�" prop="username">
+ <el-form-item label="鎵�灞炵被鍒�" prop="inventoryclasscode">
<el-select
- v-model="dialogForm.usercode"
+ v-model="dialogForm.inventoryclasscode"
style="width:200px"
placeholder="璇烽�夋嫨"
filterable
@@ -311,137 +347,182 @@
:value="item.code"
/>
</el-select>
+ </el-form-item>
+ <el-form-item label="鎵�灞炰粨搴�" prop="idwarehouse">
+ <el-select
+ v-model="dialogForm.idwarehouse"
+ style="width:200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in idwarehouseArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item required label="瀛樿揣鐘舵��">
+ <el-radio-group v-model="dialogForm.status">
+ <el-radio label="0">姝ｅ父</el-radio>
+ <el-radio label="1">鍋滅敤</el-radio>
+ </el-radio-group>
</el-form-item>
<el-divider content-position="left">璁￠噺鍗曚綅</el-divider>
- <el-form-item label="璁￠噺鏂瑰紡" prop="usercode">
+ <el-form-item label="璁￠噺鏂瑰紡" required prop="unittypcode">
<el-select
- v-model="dialogForm.usercode"
+ v-model="dialogForm.unittypcode"
style="width:200px"
placeholder="璇烽�夋嫨"
filterable
:popper-append-to-body="false"
+ @change="unittypcodeChange"
>
<el-option
- v-for="item in treeLeftArr"
+ v-for="item in unittypcodeArr"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
- <el-form-item label="璁￠噺鍗曚綅缁�" prop="username">
+ <el-form-item :label="dialogForm.unittypcode==='1'? '璁￠噺鍗曚綅':'璁￠噺鍗曚綅缁�'" prop="unitcode">
<el-select
- v-model="dialogForm.usercode"
+ v-if="dialogForm.unittypcode==='1'"
+ v-model="dialogForm.unitcode"
style="width:200px"
placeholder="璇烽�夋嫨"
filterable
:popper-append-to-body="false"
+ @change="val=>unitcodeChange(val,'1')"
>
<el-option
- v-for="item in treeLeftArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ v-for="item in unitcodeSingleArr"
+ :key="item.unitcode"
+ :label="item.unitname"
+ :value="item.unitcode"
+ />
+ </el-select>
+ <el-select
+ v-if="dialogForm.unittypcode!=='1'"
+ v-model="dialogForm.unitcode"
+ style="width:200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ :popper-append-to-body="false"
+ @change="val=>unitcodeChange(val,'0')"
+ >
+ <el-option
+ v-for="item in unitcodeGroupArr"
+ :key="item.unitcode"
+ :label="item.unitname"
+ :value="item.unitcode"
/>
</el-select>
</el-form-item>
- <el-form-item label="鎶ヨ〃杈呭姪鍗曚綅" prop="usercode">
+ <el-form-item label="鎶ヨ〃杈呭崟浣�">
<el-select
- v-model="dialogForm.usercode"
+ v-model="dialogForm.idSubUnitByReport"
style="width:200px"
placeholder="璇烽�夋嫨"
filterable
+ :disabled="dialogForm.unittypcode==='1'"
:popper-append-to-body="false"
>
<el-option
- v-for="item in treeLeftArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ v-for="item in idSubUnitByReportArr"
+ :key="item.unitcode"
+ :label="item.unitname"
+ :value="item.unitcode"
/>
</el-select>
</el-form-item>
- <el-form-item label="搴撳瓨甯哥敤鍗曚綅" prop="username">
+ <el-form-item label="搴撳瓨甯哥敤鍗曚綅">
<el-select
- v-model="dialogForm.usercode"
+ v-model="dialogForm.idUnitByStock"
style="width:200px"
placeholder="璇烽�夋嫨"
filterable
+ :disabled="dialogForm.unittypcode==='1'"
:popper-append-to-body="false"
>
<el-option
- v-for="item in treeLeftArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ v-for="item in idUnitBvStockArr"
+ :key="item.unitcode"
+ :label="item.unitname"
+ :value="item.unitcode"
/>
</el-select>
</el-form-item>
- <el-form-item label="閲囪喘甯哥敤鍗曚綅" prop="usercode">
+ <el-form-item label="閲囪喘甯哥敤鍗曚綅">
<el-select
- v-model="dialogForm.usercode"
+ v-model="dialogForm.idUnitByPurchase"
style="width:200px"
placeholder="璇烽�夋嫨"
filterable
+ :disabled="dialogForm.unittypcode==='1'"
:popper-append-to-body="false"
>
<el-option
- v-for="item in treeLeftArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ v-for="item in idUnitBvStockArr"
+ :key="item.unitcode"
+ :label="item.unitname"
+ :value="item.unitcode"
/>
</el-select>
</el-form-item>
- <el-form-item label="閿�鍞父鐢ㄥ崟浣�" prop="username">
+ <el-form-item label="閿�鍞父鐢ㄥ崟浣�">
<el-select
- v-model="dialogForm.usercode"
+ v-model="dialogForm.idUnitBySale"
style="width:200px"
placeholder="璇烽�夋嫨"
filterable
+ :disabled="dialogForm.unittypcode==='1'"
:popper-append-to-body="false"
>
<el-option
- v-for="item in treeLeftArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ v-for="item in idUnitBvStockArr"
+ :key="item.unitcode"
+ :label="item.unitname"
+ :value="item.unitcode"
/>
</el-select>
</el-form-item>
- <el-form-item label="鐢熶骇甯哥敤鍗曚綅" prop="username">
+ <el-form-item label="鐢熶骇甯哥敤鍗曚綅">
<el-select
- v-model="dialogForm.usercode"
+ v-model="dialogForm.idunitbymanufacture"
style="width:200px"
placeholder="璇烽�夋嫨"
filterable
+ :disabled="dialogForm.unittypcode==='1'"
:popper-append-to-body="false"
>
<el-option
- v-for="item in treeLeftArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ v-for="item in idUnitBvStockArr"
+ :key="item.unitcode"
+ :label="item.unitname"
+ :value="item.unitcode"
/>
</el-select>
</el-form-item>
<el-divider content-position="left">瀛樿揣灞炴��</el-divider>
- <el-checkbox v-model="dialogForm.username" style="margin-left: 70px;">澶栬喘</el-checkbox>
- <el-checkbox v-model="dialogForm.username">閿�鍞�</el-checkbox>
- <el-checkbox v-model="dialogForm.username">鑷埗</el-checkbox>
- <el-checkbox v-model="dialogForm.username">鐢熶骇娑堣��</el-checkbox>
- <el-checkbox v-model="dialogForm.username">濮斿</el-checkbox>
- <el-divider content-position="left">瀛樿揣鎻忚堪</el-divider>
- <el-form-item label="鎵�灞炵被鍒�">
- <el-input
- v-model="dialogForm.username"
- type="textarea"
- :autosize="{ minRows: 2, maxRows: 4}"
-
- style="width: 490px;"
- />
- </el-form-item>
+ <el-checkbox v-model="dialogForm.isPurchase" style="margin-left: 70px;">澶栬喘</el-checkbox>
+ <el-checkbox v-model="dialogForm.isSale">閿�鍞�</el-checkbox>
+ <el-checkbox v-model="dialogForm.isMadeSelf">鑷埗</el-checkbox>
+ <el-checkbox v-model="dialogForm.isMaterial">鐢熶骇娑堣��</el-checkbox>
+ <el-checkbox v-model="dialogForm.isMadeRequest">濮斿</el-checkbox>
+ <!-- <el-divider content-position="left">瀛樿揣鎻忚堪</el-divider>-->
+ <!-- <el-form-item label="瀛樿揣鎻忚堪">-->
+ <!-- <el-input-->
+ <!-- v-model="dialogForm.username"-->
+ <!-- type="textarea"-->
+ <!-- :autosize="{ minRows: 2, maxRows: 4}"-->
+ <!-- style="width: 490px;"-->
+ <!-- />-->
+ <!-- </el-form-item>-->
</el-form>
@@ -468,12 +549,14 @@
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import {
+ TMaterielAddUpdate,
TMaterielClassTree,
TMaterielClassTreeAddUpdate,
TMaterielClassTreeDelete,
- TMaterielData
+ TMaterielData, TMaterielDelete, TUnitGroup
} from '@/api/ProductModel'
import arrayToTree from 'array-to-tree'
+import { UnitSerch } from '@/api/GeneralBasicData'
export default {
name: 'RoleList',
@@ -533,17 +616,51 @@
dialogVisible: false,
dialogForm: {
- usercode: '', // 鐢ㄦ埛缂栫爜
- username: '' // 鐢ㄦ埛鍚嶇О
+ data_sources: 'MES', // 鏁版嵁鏉ユ簮锛汦RP/MES
+ partcode: '', // 瀛樿揣缂栫爜
+ partname: '', // 瀛樿揣鍚嶇О
+ partspec: '', // 瑙勬牸鍨嬪彿
+ inventoryclasscode: '', // 瀛樿揣绫诲瀷缂栫爜
+ unittypcode: '1', // 璁￠噺鏂瑰紡(0:澶氳閲�,1:鍗曡閲�)
+ unitcode: '', // 璁￠噺鍗曚綅缂栫爜/璁￠噺鍗曚綅缁勭紪鐮�
+ unitsubcode: '', // 璁￠噺鍗曚綅缁勫瓙椤圭紪鐮侊紙瀵瑰簲鐨勬槸 涓昏閲忓崟浣嶇紪鐮侊級
+ idSubUnitByReport: '', // 鎶ヨ〃杈呭崟浣嶇紪鐮�
+ idUnitByStock: '', // 搴撳瓨甯哥敤鍗曚綅缂栫爜
+ idUnitByPurchase: '', // 閲囪喘甯哥敤鍗曚綅缂栫爜
+ idUnitBySale: '', // 閿�鍞父鐢ㄥ崟浣嶇紪鐮�
+ idunitbymanufacture: '', // 鐢熶骇甯哥敤鍗曚綅
+ isPurchase: false, // 鏄惁澶栬喘: 0(鍚�)1(鏄�)
+ isSale: false, // 鏄惁閿�鍞�:0(鍚�)1(鏄�)
+ isMadeSelf: false, // 鏄惁鑷埗: 0(鍚�)1(鏄�)
+ isMaterial: false, // 鏄惁鐢熶骇鑰楃敤: 0(鍚�)1(鏄�)
+ isMadeRequest: false, // 鏄惁濮斿锛�0(鍚�)1(鏄�)
+ idwarehouse: '', // 浠撳簱缂栫爜
+ status: '0', // 浣跨敤鐘舵��: 姝ｅ父(0)鍋滅敤(1)
+ OperType: '' // 鎿嶄綔绫诲瀷
},
dialogFormRules: {
- usercode: [
+ partcode: [
{ required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
- username: [
+ partname: [
{ required: true, message: '璇疯緭鍏ョ粍缁囧悕绉�', trigger: ['blur', 'change'] }
+ ],
+ unitcode: [
+ { required: true, message: '璇烽�夋嫨璁￠噺鍗曚綅(缁�)', trigger: ['blur', 'change'] }
+ ],
+ inventoryclasscode: [
+ { required: true, message: '璇烽�夋嫨鎵�灞炲崟浣�', trigger: ['blur', 'change'] }
]
- }
+ },
+ unittypcodeArr: [
+ { code: '1', name: '鍗曡閲�' },
+ { code: '0', name: '澶氳閲�' }
+ ],
+ unitcodeSingleArr: [],
+ unitcodeGroupArr: [],
+ idSubUnitByReportArr: [],
+ idUnitBvStockArr: [],
+ idwarehouseArr: []
}
},
@@ -556,8 +673,16 @@
this.getHeight()
this.getTMaterielClassTree()
+ this.getSelectApi()
},
methods: {
+ async getSelectApi() {
+ const { data: res } = await UnitSerch({ tunittype: 'M' })
+ this.unitcodeGroupArr = res
+
+ const { data: res2 } = await UnitSerch({ tunittype: 'S' })
+ this.unitcodeSingleArr = res2
+ },
async getTMaterielClassTree() {
const res = await TMaterielClassTree()
res.data.forEach(i => {
@@ -607,9 +732,6 @@
this.form.prop = prop
this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
},
- getOrganizationSearch() {
- this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
- },
// 鏂板鎸夐挳
add(operation) {
this.operation = operation
@@ -623,7 +745,7 @@
this.dialogForm.OperType = 'Update'
this.$nextTick(() => {
- this.dialogForm.usercode = row.usercode
+ this.dialogForm.data_sources = row.data_sources
})
},
del(row) {
@@ -632,13 +754,12 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- // const result = this.getChildrenCodeMethod(data, [])
- // TMaterielClassTreeDelete({ inventoryclasscode: result.join(',') }).then(res => {
- // if (res.code === '200') {
- // this.$notify.success('鍒犻櫎鎴愬姛!')
- // this.getTMaterielClassTree()
- // }
- // })
+ TMaterielDelete({ partcode: row.partcode, data_sources: row.data_sources }).then(res => {
+ if (res.code === '200') {
+ this.$notify.success('鍒犻櫎鎴愬姛!')
+ this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+ }
+ })
}).catch(() => {
this.$notify.info('宸插彇娑堝垹闄�')
})
@@ -648,13 +769,31 @@
this.form.partcode = ''
this.form.partname = ''
this.form.partspec = ''
- this.getTMaterielClassTree()
+ this.$refs.treeLeftRef.setCurrentKey('-1')
+ this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
- this.dialogForm.usercode = ''
- this.dialogForm.username = ''
-
+ this.dialogForm.data_sources = 'MES'
+ this.dialogForm.partcode = ''
+ this.dialogForm.partname = ''
+ this.dialogForm.partspec = ''
+ this.dialogForm.inventoryclasscode = ''
+ this.dialogForm.unittypcode = '1'
+ this.dialogForm.unitcode = ''
+ this.dialogForm.unitsubcode = ''
+ this.dialogForm.idSubUnitByReport = ''
+ this.dialogForm.idUnitByStock = ''
+ this.dialogForm.idUnitByPurchase = ''
+ this.dialogForm.idUnitBySale = ''
+ this.dialogForm.idunitbymanufacture = ''
+ this.dialogForm.isPurchase = false
+ this.dialogForm.isSale = false
+ this.dialogForm.isMadeSelf = false
+ this.dialogForm.isMaterial = false
+ this.dialogForm.isMadeRequest = false
+ this.dialogForm.idwarehouse = ''
+ this.dialogForm.status = '0'
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -665,22 +804,31 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
- // this.$store.state.app.buttonIsDisabled = true
- // this.dialogForm.group_code = this.dialogForm.group_code.join(',')
- // this.dialogForm.post_code = this.dialogForm.post_code.join(',')
- // this.dialogForm.role_code = this.dialogForm.role_code.join(',')
- // this.dialogForm.storg_code = this.dialogForm.storg_code[this.dialogForm.storg_code.length - 1]
- // AddUpdateUserSave(this.dialogForm).then(res => {
- // if (res.code === '200') {
- // this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- // this.dialogVisible = false
- // this.$store.state.app.buttonIsDisabled = false
- // this.getUserData()
- // } else {
- // this.$store.state.app.buttonIsDisabled = false
- // this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- // }
- // })
+ this.dialogForm.isPurchase = this.dialogForm.isPurchase ? '1' : '0'
+ this.dialogForm.isSale = this.dialogForm.isSale ? '1' : '0'
+ this.dialogForm.isMadeSelf = this.dialogForm.isMadeSelf ? '1' : '0'
+ this.dialogForm.isMaterial = this.dialogForm.isMaterial ? '1' : '0'
+ this.dialogForm.isMadeRequest = this.dialogForm.isMadeRequest ? '1' : '0'
+ // console.log(JSON.parse(JSON.stringify(this.dialogForm)), 1)
+
+ if (this.dialogForm.unittypcode === '1') {
+ this.dialogForm.idUnitByStock = this.dialogForm.unitcode
+ this.dialogForm.idUnitByPurchase = this.dialogForm.unitcode
+ this.dialogForm.idUnitBySale = this.dialogForm.unitcode
+ this.dialogForm.idunitbymanufacture = this.dialogForm.unitcode
+ }
+ this.$store.state.app.buttonIsDisabled = true
+ TMaterielAddUpdate(this.dialogForm).then(res => {
+ if (res.code === '200') {
+ this.$notify.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+ this.dialogVisible = false
+ this.$store.state.app.buttonIsDisabled = false
+ this.getTMaterielData(this.$refs.treeLeftRef.getCurrentNode())
+ } else {
+ this.$store.state.app.buttonIsDisabled = false
+ this.$notify.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ }
+ })
}
})
},
@@ -756,6 +904,51 @@
})
}
})
+ },
+ unittypcodeChange(val) {
+ console.log(val)
+
+ this.dialogForm.unitcode = ''
+ this.dialogForm.unitsubcode = ''
+ this.dialogForm.idSubUnitByReport = ''
+ this.dialogForm.idUnitByStock = ''
+ this.dialogForm.idUnitByPurchase = ''
+ this.dialogForm.idUnitBySale = ''
+ this.dialogForm.idunitbymanufacture = ''
+ // this.$refs.dialogForm.clearValidate()
+ // this.$forceUpdate()
+ },
+ unitcodeChange(val, type) {
+ console.log(val)
+
+ if (type === '1') {
+ // this.dialogForm.unitcode = val
+ this.dialogForm.unitsubcode = ''
+ this.dialogForm.idSubUnitByReport = ''
+
+ const unitname = this.unitcodeSingleArr.find(i => i.unitcode === val).unitname
+
+ this.dialogForm.idUnitByStock = unitname
+ this.dialogForm.idUnitByPurchase = unitname
+ this.dialogForm.idUnitBySale = unitname
+ this.dialogForm.idunitbymanufacture = unitname
+ }
+
+ if (type === '0') {
+ const t = this.unitcodeGroupArr.find(i => i.unitcode === val).children
+
+ this.idSubUnitByReportArr = t.filter(i => i.isMainUnit !== '1')
+ this.idUnitBvStockArr = t
+
+ const mainUnitCode = t.find(i => i.isMainUnit === '1').unitcode
+ this.dialogForm.unitsubcode = mainUnitCode
+ this.dialogForm.idSubUnitByReport = this.idSubUnitByReportArr[0].unitcode
+
+ this.dialogForm.idUnitByStock = mainUnitCode
+ this.dialogForm.idUnitByPurchase = mainUnitCode
+ this.dialogForm.idUnitBySale = mainUnitCode
+ this.dialogForm.idunitbymanufacture = mainUnitCode
+ }
}
}
}
--
Gitblit v1.9.3