|
|
@@ -86,7 +86,7 @@
|
|
|
v-for="(item,index) in userList"
|
|
|
:key="index"
|
|
|
:label="item.realName"
|
|
|
- :value="item.id"
|
|
|
+ :value="item.realName"
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</template>
|
|
|
@@ -298,7 +298,7 @@
|
|
|
<report-dialog
|
|
|
:switchDialog="switchDialog"
|
|
|
:reportId="form.id"
|
|
|
- reportName="事务-报销单"
|
|
|
+ reportName=""
|
|
|
@onClose="onClose()"
|
|
|
/>
|
|
|
<!-- 商品弹窗-->
|
|
|
@@ -467,14 +467,15 @@ export default {
|
|
|
span: 8,
|
|
|
type: "date",
|
|
|
format: "yyyy-MM-dd",
|
|
|
- valueFormat: "yyyy-MM-dd 00:00:00",
|
|
|
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
|
|
|
rules: [
|
|
|
{
|
|
|
required: true,
|
|
|
message: " ",
|
|
|
trigger: "blur"
|
|
|
}
|
|
|
- ]
|
|
|
+ ],
|
|
|
+ disabled: false
|
|
|
},
|
|
|
{
|
|
|
label: "仓管员",
|
|
|
@@ -656,13 +657,13 @@ export default {
|
|
|
} else {
|
|
|
getUserInfo().then(res => {
|
|
|
this.$set(this.form, 'createUser', res.data.data.id);
|
|
|
- this.$set(this.form, 'userName', res.data.data.realName);
|
|
|
+ // this.$set(this.form, 'userName', res.data.data.realName);
|
|
|
this.$set(this.form, 'createDept', res.data.data.deptId);
|
|
|
- this.$set(this.form, 'deptName', res.data.data.deptName);
|
|
|
- this.$set(this.form, 'postId', res.data.data.postId.split(',')[0]);
|
|
|
- this.$set(this.form, 'postName', res.data.data.postName.split(',')[0]);
|
|
|
+ // this.$set(this.form, 'deptName', res.data.data.deptName);
|
|
|
+ // this.$set(this.form, 'postId', res.data.data.postId.split(',')[0]);
|
|
|
+ // this.$set(this.form, 'postName', res.data.data.postName.split(',')[0]);
|
|
|
this.loginUser = res.data.data.realName;
|
|
|
- this.oldForm = Object.assign({}, this.form);
|
|
|
+ this.oldForm = this.deepClone(this.form);
|
|
|
this.oldDataList = this.deepClone(this.dataList);
|
|
|
})
|
|
|
}
|
|
|
@@ -680,17 +681,11 @@ export default {
|
|
|
queryData(id) {
|
|
|
this.pageLoading = true;
|
|
|
dataDetail(id).then(res => {
|
|
|
- this.form = res.data.data;
|
|
|
+ this.$set(this,'form',res.data.data)
|
|
|
this.confirmDisabled = this.form.deliveryStatus === '确认调拨'? true: false;
|
|
|
this.dataList = this.form.deliveryItemsList? this.form.deliveryItemsList: [];
|
|
|
- // delete this.form.deliveryItemsList;
|
|
|
- this.oldForm = {...this.form};
|
|
|
- this.oldDataList = [...this.dataList];
|
|
|
- if (this.form.status > 0) {
|
|
|
- this.option.column.map(e => {
|
|
|
- this.$set(e, 'disabled', true)
|
|
|
- })
|
|
|
- }
|
|
|
+ this.oldForm = this.deepClone(this.form);
|
|
|
+ this.oldDataList = this.deepClone(this.dataList);
|
|
|
}).finally(() => {
|
|
|
this.pageLoading = false;
|
|
|
})
|
|
|
@@ -1116,6 +1111,9 @@ export default {
|
|
|
confirmAllot(this.form).then(res => {
|
|
|
this.queryData(this.form.id);
|
|
|
this.$message.success('调拨成功');
|
|
|
+ this.option.column.map(e => {
|
|
|
+ this.$set(e, 'disabled', true);
|
|
|
+ })
|
|
|
}).finally(() => {
|
|
|
this.btnLoading = false;
|
|
|
})
|
|
|
@@ -1128,6 +1126,11 @@ export default {
|
|
|
repealAllot(this.form).then(res => {
|
|
|
this.queryData(this.form.id);
|
|
|
this.$message.success('撤销成功');
|
|
|
+ this.option.column.map(e => {
|
|
|
+ if (e.prop != 'sysNo' && e.prop != 'createTime' && e.prop != 'deliveryStatus') {
|
|
|
+ this.$set(e, 'disabled', false);
|
|
|
+ }
|
|
|
+ })
|
|
|
}).finally(() => {
|
|
|
this.btnLoading = false;
|
|
|
})
|
lichao