From 1b8db0473522c886428767f7eeaaf7f52d47ce42 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 20 十二月 2023 15:30:41 +0800
Subject: [PATCH] 1.盘带人级联 2.盘点物品为仓库内物品
---
admin-web/src/views/stock/inventorycount/inventorytask/edit.vue | 138 +++++++++++++++++++++++++++++++++------------
1 files changed, 100 insertions(+), 38 deletions(-)
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue b/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
index 7a747d4..5bca285 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
@@ -1,23 +1,35 @@
<template>
- <win-sm :title="setting.title" @close="close" :width="'800px'">
- <el-form ref="ruleForm" :model="formData" :rules="rules" class="demo-ruleForm" label-width="100px">
- <el-form-item label="鐩樼偣鍗曞悕" prop="code">
- <el-input disabled v-model="formData.code" clearable maxlength="20" show-word-limit style="width: 100%" />
+ <win-sm :title="`${setting.title}鐩樼偣`" @close="close" :width="'800px'">
+ <el-form v-loading="loading" ref="ruleForm" :model="formData" :rules="rules" class="demo-ruleForm" label-width="100px">
+ <el-form-item label="鐩樼偣鍗曞悕" prop="businessFormName">
+ <el-input
+ v-model="formData.businessFormName"
+ clearable
+ maxlength="20"
+ style="width: 100%"
+ placeholder="璇疯緭鍏�"
+ />
</el-form-item>
- <el-form-item label="鐩樼偣浠撳簱" prop="name">
- <el-input v-model="formData.name" clearable maxlength="20" show-word-limit style="width: 100%" />
+ <el-form-item label="鐩樼偣浠撳簱" prop="warehouseId">
+ <el-select @change="getPdr" v-model="formData.warehouseId" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in warehouseOptions" :key="item.id" :label="item.warehouseName" :value="item.id" />
+ </el-select>
</el-form-item>
- <el-form-item label="鐩樼偣浜�">
- <el-input v-model="formData.adss" clearable maxlength="20" show-word-limit style="width: 100%" />
+ <el-form-item label="鐩樼偣浜�" prop="operatorUserId">
+ <el-select v-model="formData.operatorUserId" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in operatorOptions" :key="item.id" :label="item.managerName" :value="item.managerId" />
+ </el-select>
</el-form-item>
- <el-form-item label="鐩戠洏浜�">
- <el-input v-model="formData.adss" clearable maxlength="20" show-word-limit style="width: 100%" />
+ <el-form-item label="鐩戠洏浜�" prop="monitorUserId">
+ <el-select v-model="formData.monitorUserId" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in operatorOptions2" :key="item.id" :label="item.userName" :value="item.id" />
+ </el-select>
</el-form-item>
- <el-form-item label="澶囨敞" prop="status">
+ <el-form-item label="澶囨敞" prop="remark">
<el-input
type="textarea"
placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="formData.adss"
+ v-model="formData.remark"
resize="none"
maxlength="100"
show-word-limit
@@ -32,9 +44,13 @@
</template>
<script>
+import {selectTenantWarehouse, tenantUserQueryUser} from '@/api/baseSetting/finsystenant';
+import {inventoryAdd, inventoryEdit} from '@/api/stock/inventory';
+import {warehouseManagerList} from '@/api/foudation/store';
import winSm from '@/components/win/win-sm';
import myButton from '@/components/myButton/myButton';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
+import {formatDate} from '@/utils/DateFormatter';
+import {mapGetters} from 'vuex';
export default {
components: { winSm, myButton },
@@ -46,27 +62,75 @@
},
data() {
return {
+ count: 0,
+ loading: true,
checkAll: false,
checkedList: [],
+ warehouseOptions: [], // 浠撳簱鍒楄〃
+ operatorOptions: [],
+ operatorOptions2: [],
formData: {
- code: '',
- name: '',
- status: true,
- summary: '',
+ businessFormName: '',
+ warehouseId: '',
+ operatorUserId: '',
+ monitorUserId: '',
+ remark: '',
},
rules: {
- code: [{ required: true, message: '璇疯緭鍏ユ満鏋勭紪鍙�', trigger: 'blur' }],
- name: [{ required: true, message: '璇疯緭鍏ユ満鏋勫悕绉�', trigger: 'blur' }],
- status: [{ required: true, message: '璇烽�夋嫨鐘舵��', trigger: 'blur' }],
+ businessFormName: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }],
+ warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'blur' }],
+ operatorUserId: [{ required: true, message: '璇烽�夋嫨', trigger: 'blur' }],
+ monitorUserId: [{ required: true, message: '璇烽�夋嫨', trigger: 'blur' }],
},
};
},
+ computed: {
+ ...mapGetters(['userInfo']),
+ },
created() {
- if (this.setting.info) {
+ if (this.setting.id) {
this.formData = Object.assign({}, JSON.parse(this.setting.info));
+ this.$set(this.formData,'operatorUserId',this.formData.operatorId)
+ this.$set(this.formData,'monitorUserId',this.formData.operatorId2)
+ this.$set(this.formData,'remark',this.formData.beiz1)
+ } else {
+ this.formData.businessFormName = formatDate(new Date(), 'yyyy骞碝M鏈堜唤鐩樼偣');
}
+ this.handleSelectTenantWarehouse();
+ //this.getPdr();
+ this.getJpr();
},
methods: {
+ // 鑾峰彇浠撳簱鍒楄〃
+ handleSelectTenantWarehouse() {
+ selectTenantWarehouse({ agencyId: this.userInfo.tenantId }).then((res) => {
+ this.count++
+ this.warehouseOptions = res;
+ if(this.count>1){
+ this.loading = false
+ }
+ });
+ },
+ // 鑾峰彇鐩樼偣浜�
+ getPdr() {
+ warehouseManagerList({ warehouseId: this.formData.warehouseId }).then((res) => {
+ this.count++
+ this.operatorOptions = res;
+ if(this.count>1){
+ this.loading = false
+ }
+ });
+ },
+ // 鑾峰彇鐩戠洏浜�
+ getJpr() {
+ tenantUserQueryUser({ tenantId: this.userInfo.tenantId }).then((res) => {
+ this.count++
+ this.operatorOptions2 = res;
+ if(this.count>1){
+ this.loading = false
+ }
+ });
+ },
getEditInfo(id) {},
close() {
this.$emit('close');
@@ -75,27 +139,25 @@
this.$refs.ruleForm.validate((valid) => {
if (valid) {
const params = Object.assign({}, this.formData);
+ this.loading = true
if (this.setting.id) {
// 缂栬緫鎺ュ彛
- finsystenant.edit(params).then((res) => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�');
- this.close();
- this.$emit('search');
- } else {
- this.$message.error('淇濆瓨澶辫触');
- }
+ inventoryEdit(params).then((res) => {
+ this.loading = false
+ this.$message.success('淇濆瓨鎴愬姛锛�');
+ this.close();
+ this.$emit('search');
+ }).catch(()=>{
+ this.loading = false
});
} else {
- params.orgId = this.setting.orgId;
- finsystenant.add(params).then((res) => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�');
- this.close();
- this.$emit('search');
- } else {
- this.$message.error('淇濆瓨澶辫触');
- }
+ inventoryAdd(params).then((res) => {
+ this.loading = false
+ this.$message.success('淇濆瓨鎴愬姛锛�');
+ this.close();
+ this.$emit('search');
+ }).catch(()=>{
+ this.loading = false
});
}
} else {
--
Gitblit v1.9.1