From 5e10fe06e80c7d146cbb5eb8f7b3e1e447a80b88 Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期五, 17 十一月 2023 17:07:53 +0800
Subject: [PATCH] 部门物品：物品分发，物品报废静态。调拨管理联调，price由元改为分，仓库管理库管员
---
admin-web/src/views/stock/transfer/transferdetails/index.vue | 314 ++++++++++++++++++++-------------------------------
1 files changed, 125 insertions(+), 189 deletions(-)
diff --git a/admin-web/src/views/stock/transfer/transferdetails/index.vue b/admin-web/src/views/stock/transfer/transferdetails/index.vue
index cfd17a1..cfca3d8 100644
--- a/admin-web/src/views/stock/transfer/transferdetails/index.vue
+++ b/admin-web/src/views/stock/transfer/transferdetails/index.vue
@@ -10,55 +10,57 @@
<el-row style="margin-top: 15px">
<el-col>
<!--鍒楄〃-->
- <my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
+ <my-table-v2 ref="myTable" :filter="filterFrom" :table="table" />
</el-col>
</el-row>
<!--娣诲姞/缂栬緫寮圭獥-->
- <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search"/>
+ <detail
+ v-if="detailSetting.show"
+ :setting="detailSetting"
+ @close="detailSetting.show = false"
+ @search="search"
+ />
</el-card>
</el-container>
</el-container>
- <my-import
- :import-setting="importSetting"
- :dialog-show="importSetting.dialogShow"
- :dialog-title="importSetting.dialogTitle"
- />
</div>
</template>
<script>
-import MyTableV2 from "@/components/myTable/myTableV2";
-import MyButton from "@/components/myButton/myButton";
+import MyTableV2 from '@/components/myTable/myTableV2';
+import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
-import edit from './edit'
-import * as finsystenant from '@/api/baseSetting/finsystenant'
-import myImport from '@/views/components/myImport'
-import {getBaseUrl} from '@/utils/base';
+import detail from '../transferApplication/detail';
+import * as finsystenant from '@/api/baseSetting/finsystenant';
+import myImport from '@/views/components/myImport';
+import { getBaseUrl } from '@/utils/base';
+import { goodsModel } from '@/api/baseSetting/finsystenant';
+import * as DateFormatter from '@/utils/DateFormatter';
export default {
- name: "index",
- components: {MyButton, MyTableV2, edit, myImport},
+ name: 'index',
+ components: { MyButton, MyTableV2, detail, myImport },
data() {
return {
// 鎼滅储妗�
items: [
{
type: 'text',
- dataIndex: 'name',
+ dataIndex: 'businessFormCode',
label: '鍗曞彿',
placeholder: '璇疯緭鍏�',
- defaultValue: ''
+ defaultValue: '',
},
{
type: 'text',
- dataIndex: 'name',
+ dataIndex: 'goodsName',
label: '鐗╁搧鍚嶇О',
placeholder: '璇疯緭鍏�',
- defaultValue: ''
+ defaultValue: '',
},
{
type: 'select',
- dataIndex: 'warehouseId',
+ dataIndex: 'baseGoodsModelsId',
label: '瑙勬牸鍨嬪彿',
placeholder: '璇烽�夋嫨',
defaultValue: '',
@@ -66,7 +68,7 @@
},
{
type: 'cascader',
- dataIndex: 'name',
+ dataIndex: 'outAgencyId',
label: '璋冩嫧鏈烘瀯',
placeholder: '璇烽�夋嫨',
optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
@@ -75,7 +77,7 @@
},
{
type: 'cascader',
- dataIndex: 'name',
+ dataIndex: 'inAgencyId',
label: '鎺ユ敹鏈烘瀯',
placeholder: '璇烽�夋嫨',
optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
@@ -83,35 +85,11 @@
options: [],
},
{
- type: 'select',
- dataIndex: 'status',
- label: '绫诲瀷',
- placeholder: '璇烽�夋嫨',
- defaultValue: '1',
- options: [
- {
- label: '鍚敤',
- value: '1'
- },
- {
- label: '绂佺敤',
- value: '0'
- }
- ]
- },
- {
type: 'text',
- dataIndex: 'name',
- label: '鐗╁搧鍚嶇О',
- placeholder: '璇疯緭鍏�',
- defaultValue: ''
- },
- {
- type: 'text',
- dataIndex: 'name',
+ dataIndex: 'operatorName',
label: '鍒涘缓浜�',
placeholder: '璇疯緭鍏�',
- defaultValue: ''
+ defaultValue: '',
},
{
type: 'date-picker',
@@ -138,69 +116,80 @@
defaultValue: '',
},
],
- // 鏍戞暟鎹�
- treeDataList: [],
// 鎼滅储鏉′欢
filterFrom: {
tenantId: null,
userName: null,
userPhone: null,
- status: 1
+ status: 1,
},
- // 瀵煎叆
- importSetting: {
- dialogTitle: '瀵煎叆',
- dialogShow: false,
- fileSettings: {
- data: {},
- uploadUrl: getBaseUrl()+"/pc/fin/sys/tenant/import", // 涓婁紶鍦板潃
- accept: '.xls', // 鏍煎紡
- type: 'text', // 鍥炴樉褰㈠紡
- loading: false // 瀵煎叆鏁堟灉
- },
- /* 妯℃澘涓嬭浇 */
- templateSettings: {
- templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 涓嬭浇鍦板潃
- },
- onSuccess: null
- },
- editSetting: {
+ detailSetting: {
title: '',
id: '',
- orgId: '',
show: false,
},
// 琛ㄦ牸鏁版嵁
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/transfer/detail/list', // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
- columnsCtrl: {// 鍒楁帶鍒舵寜閽�
- show: false
+ columnsCtrl: {
+ // 鍒楁帶鍒舵寜閽�
+ show: false,
},
- generalExport: {// 閫氱敤瀵煎嚭鎸夐挳
- show: false
+ generalExport: {
+ // 閫氱敤瀵煎嚭鎸夐挳
+ show: false,
},
// 鑷畾涔夊伐鍏锋潯鎸夐挳
- custom: [
- ]
+ custom: [],
},
// 鍒椾俊鎭�
columns: [
- {title: '鍗曞彿', field: 'code', align: 'center'},
- {title: '鐗╁搧鍚嶇О', field: 'lv', align: 'center', },
- {title: '瑙勬牸鍨嬪彿', field: 'lv', align: 'center', },
- {title: '鏁伴噺', field: 'summary', align: 'left',},
- {title: '鎺ュ彈鏈烘瀯', field: 'summary', align: 'left',},
- {title: '鍒涘缓浜�', field: 'summary', align: 'left',},
- {title: '鐢宠鏃堕棿', field: 'summary', align: 'left',},
- {title: '鎺ユ敹鏃堕棿', field: 'summary', align: 'left',},
- {title: '璋冩嫧鏈烘瀯', field: 'summary', align: 'left',},
- {title: '璋冩嫧浜�', field: 'summary', align: 'left',},
- {title: '璋冩嫧鏃堕棿', field: 'summary', align: 'left',},
+ { title: '鍗曞彿', field: 'businessFormCode', align: 'center' },
+ { title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'center' },
+ { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'center' },
+ { title: '鏁伴噺', field: 'counts', align: 'left' },
+ { title: '鎺ュ彈鏈烘瀯', field: 'inAgencyName', align: 'left' },
+ { title: '鍒涘缓浜�', field: 'operatorName', align: 'left' },
+ {
+ title: '鐢宠鏃堕棿',
+ field: 'createTime',
+ align: 'center',
+ width: 160,
+ formatter: (row) => {
+ return { value: DateFormatter.LongToDateTime(row.createTime) };
+ },
+ },
+ {
+ title: '鎺ユ敹鏃堕棿',
+ field: 'inTime',
+ align: 'center',
+ width: 160,
+ formatter: (row) => {
+ return { value: row.inTime ? DateFormatter.LongToDateTime(row.inTime) : '-' };
+ },
+ },
+ { title: '璋冩嫧鏈烘瀯', field: 'outAgencyName', align: 'left' },
+ {
+ title: '璋冩嫧浜�',
+ field: 'outOperatorName',
+ align: 'center',
+ formatter: (row) => {
+ return { value: row.outOperatorName || '-' };
+ },
+ },
+ {
+ title: '璋冩嫧鏃堕棿',
+ field: 'outputTime',
+ align: 'center',
+ width: 160,
+ formatter: (row) => {
+ return { value: row.outputTime ? DateFormatter.LongToDateTime(row.outputTime) : '-' };
+ },
+ },
],
// 鎿嶄綔淇℃伅
operation: {
@@ -210,7 +199,7 @@
{
title: '璇︽儏',
events: (row) => {
- this.showAudit(row);
+ this.showDetail(row);
},
},
],
@@ -222,118 +211,65 @@
small: false,
pageNum: 1,
pageSize: 10,
- total: 0
- }
- }
+ total: 0,
+ },
+ },
},
- }
+ };
},
created() {
- // 鑾峰彇鏈烘瀯鏍�
- this.initTreeData()
+ this.initSearch();
},
methods: {
- //瀵煎叆
- importOrg() {
- this.importSetting.dialogShow = true
- this.importSetting.onSuccess = (response, callBack) => {
- if (response.code===1){
- this.$message.success(response.msg)
- this.search(1)
- }else{
- this.$message.warning(response.msg)
- }
- callBack()
- }
- },
- // 宸︿晶鏍戝垵濮嬪寲
- initTreeData() {
- finsystenant.getTree().then(res => {
- const content = res || []
- this.treeDataList.splice(0, this.treeDataList.length)
- this.treeDataList = content
- if (content.length > 0) {
- this.importSetting.fileSettings.data = {pid: content[0].id}
- }
- })
- },
- updState(row) {
- let vm = this
- let text = row.status == 0 ? "鍚敤" : "绂佺敤";
- vm.$modal.confirm('纭瑕�' + text + '"' + row.name + '"鍚楋紵').then(function () {
- let params = Object.assign({}, row)
- params.status = row.status == 1 ? 0 : 1
- finsystenant.edit(params).then(res => {
- if (res) {
- row.status = row.status === 1 ? 0 : 1
- vm.$modal.msgSuccess(text + "鎴愬姛");
- vm.search()
- }
- })
- })
- },
- del(row) {
- this.$modal
- .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�')
- .then(function () {
- finsystenant.del({id: row.id}).then((res) => {
+ initSearch() {
+ this.items.map(async (item) => {
+ if (item.label == '瑙勬牸鍨嬪彿') {
+ let res = await goodsModel();
+ item.options = res.map((v) => {
+ v.label = v.modelName;
+ v.value = v.id;
+ return v;
});
- })
- .then((res) => {
- this.$message.success('鍒犻櫎鎴愬姛锛�');
- this.search()
- })
- .catch(() => {
- });
+ }
+ return item;
+ });
},
- showAdd() {
- // if (!this.editSetting.orgId) {
- // this.$message.warning('璇峰厛閫夋嫨宸︿晶鏈烘瀯')
- // } else {
- this.editSetting.id = null;
- this.editSetting.info = null;
- this.editSetting.title = '鏂板';
- this.editSetting.show = true;
- // }
- },
- showAudit(row) {
- this.editSetting.id = row.id;
- this.editSetting.info = JSON.stringify(row);
- this.editSetting.title = '缂栬緫';
- this.editSetting.show = true;
- },
- nodeClick(param) {
- param = param || {}
- this.p = Object.assign({}, {
- id: param.id,
- name: param.name
- })
- if (this.p.id != undefined && this.p.id != null) {
- this.filterFrom.tenantId = this.p.id
- this.editSetting.orgId = this.p.id
- } else {
- this.filterFrom.tenantId = null
- this.editSetting.orgId = null
- }
- this.importSetting.fileSettings.data = {pid: param.id}
- this.search(1)
+ showDetail(row) {
+ this.detailSetting.id = row.id;
+ this.detailSetting.info = JSON.stringify(row);
+ this.detailSetting.title = '璇︽儏';
+ this.detailSetting.show = true;
},
// 鏌ヨtable鍒楄〃
search(pageNum) {
if (pageNum != undefined) {
- this.$refs.myTable.search(pageNum)
+ this.$refs.myTable.search(pageNum);
} else {
- this.$refs.myTable.search()
+ this.$refs.myTable.search();
}
},
fifterForm(params) {
- this.filterFrom = Object.assign(this.filterFrom, params)
- this.search(1)
- }
- }
-}
+ this.filterFrom = Object.assign(this.filterFrom, params);
+ if (this.filterFrom.outAgencyId && this.filterFrom.outAgencyId.length) {
+ this.filterFrom.outAgencyId = this.filterFrom.outAgencyId[this.filterFrom.outAgencyId.length - 1];
+ }
+ if (this.filterFrom.inAgencyId && this.filterFrom.inAgencyId.length) {
+ this.filterFrom.inAgencyId = this.filterFrom.inAgencyId[this.filterFrom.inAgencyId.length - 1];
+ }
+ if (this.filterFrom.createTimeStart) {
+ this.filterFrom.createTimeStart = this.filterFrom.createTimeStart.replace(/\-/g, '');
+ }
+ if (this.filterFrom.createTimeEnd) {
+ this.filterFrom.createTimeEnd = this.filterFrom.createTimeEnd.replace(/\-/g, '');
+ }
+ if (this.filterFrom.startTime) {
+ this.filterFrom.startTime = this.filterFrom.startTime.replace(/\-/g, '');
+ }
+ if (this.filterFrom.endTime) {
+ this.filterFrom.endTime = this.filterFrom.endTime.replace(/\-/g, '');
+ }
+ this.search(1);
+ },
+ },
+};
</script>
-
-<style scoped>
-
-</style>
--
Gitblit v1.9.1