From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/stock/inventorycount/inventorytask/edit.vue | 113 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 76 insertions(+), 37 deletions(-)
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue b/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
index 8aa9b05..7a661e7 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
@@ -1,6 +1,6 @@
<template>
- <win-sm :title="setting.title" @close="close" :width="'800px'">
- <el-form ref="ruleForm" :model="formData" :rules="rules" class="demo-ruleForm" label-width="100px">
+ <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"
@@ -15,21 +15,21 @@
<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="鐩樼偣浜�" prop="operatorId">
- <el-select v-model="formData.operatorId" placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in operatorOptions" :key="item.id" :label="item.warehouseName" :value="item.id" />
+ <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="鐩戠洏浜�" prop="operatorId2">
- <el-select v-model="formData.operatorId2" placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in operatorOptions" :key="item.id" :label="item.warehouseName" :value="item.id" />
+ <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="beiz1">
+ <el-form-item label="澶囨敞" prop="remark">
<el-input
type="textarea"
placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="formData.beiz1"
+ v-model="formData.remark"
resize="none"
maxlength="100"
show-word-limit
@@ -44,11 +44,13 @@
</template>
<script>
-import { selectTenantWarehouse } from '@/api/baseSetting/finsystenant';
+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 {formatDate} from '@/utils/DateFormatter'
+import { formatDate } from '@/utils/DateFormatter';
+import { mapGetters } from 'vuex';
export default {
components: { winSm, myButton },
@@ -60,35 +62,73 @@
},
data() {
return {
+ count: 0,
+ loading: true,
checkAll: false,
checkedList: [],
warehouseOptions: [], // 浠撳簱鍒楄〃
- operatorOptions:[],
- formData: {},
+ operatorOptions: [],
+ operatorOptions2: [],
+ formData: {
+ businessFormName: '',
+ warehouseId: '',
+ operatorUserId: '',
+ monitorUserId: '',
+ remark: '',
+ },
rules: {
businessFormName: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }],
warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'blur' }],
- operatorId: [{ required: true, message: '璇烽�夋嫨', trigger: 'blur' }],
- operatorId2: [{ 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));
- }else {
- this.formData.businessFormName = formatDate(new Date(),'yyyy骞碝M鏈堜唤鐩樼偣')
+ 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();
- let temp =
- this.formData.operatorId = '1109327915216504'
- this.formData.operatorId2 = '10990356630810'
+ this.getPdr();
+ this.getJpr();
},
methods: {
// 鑾峰彇浠撳簱鍒楄〃
handleSelectTenantWarehouse() {
- selectTenantWarehouse().then((res) => {
+ selectTenantWarehouse({ agencyId: this.userInfo.tenantId }).then((res) => {
+ this.count++
this.warehouseOptions = res;
+ if(this.count>1){
+ this.loading = false
+ }
+ });
+ },
+ // 鑾峰彇鐩樼偣浜�
+ getPdr() {
+ warehouseManagerList({ tenantId: this.userInfo.tenantId }).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) {},
@@ -99,26 +139,25 @@
this.$refs.ruleForm.validate((valid) => {
if (valid) {
const params = Object.assign({}, this.formData);
+ this.loading = true
if (this.setting.id) {
// 缂栬緫鎺ュ彛
inventoryEdit(params).then((res) => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�');
- this.close();
- this.$emit('search');
- } else {
- this.$message.error('淇濆瓨澶辫触');
- }
+ this.loading = false
+ this.$message.success('淇濆瓨鎴愬姛锛�');
+ this.close();
+ this.$emit('search');
+ }).catch(()=>{
+ this.loading = false
});
} else {
inventoryAdd(params).then((res) => {
- if (res) {
- this.$message.success('淇濆瓨鎴愬姛锛�');
- this.close();
- this.$emit('search');
- } else {
- this.$message.error('淇濆瓨澶辫触');
- }
+ this.loading = false
+ this.$message.success('淇濆瓨鎴愬姛锛�');
+ this.close();
+ this.$emit('search');
+ }).catch(()=>{
+ this.loading = false
});
}
} else {
--
Gitblit v1.9.1