浏览代码

修改bug

lichao 3 年之前
父节点
当前提交
8327f15c2c

+ 1 - 1
src/views/dealer/sales/detail.vue

@@ -1099,7 +1099,7 @@ export default {
           balanceAmount: 0,
           balanceQuantity: 0,
         };
-        this.$set(form, 'purchaseAmount', a.balanceQuantity == 0? 0: (Number(a.balanceAmount) / Number(a.balanceQuantity)).toFixed(2));
+        this.$set(form, 'purchaseAmount', a.inQuantity == 0? 0: (Number(a.inAmount) / Number(a.inQuantity)).toFixed(2));
         this.$set(form, 'stock', a.balanceQuantity);
       })
       return form;

+ 8 - 13
src/views/statisticAnalysis/salesReconciliation/index.vue

@@ -55,7 +55,8 @@ export default {
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
-      option: {
+      option: {},
+      defaultOption: {
         searchShow: true,
         align: "center",
         searchSpan: 8,
@@ -165,7 +166,7 @@ export default {
     }
   },
   async created() {
-    // this.option = await this.getColumnData(this.getColumnName(126), option);
+    this.option = await this.getColumnData(this.getColumnName(126), this.defaultOption);
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++
@@ -294,28 +295,22 @@ export default {
     },
     //列保存触发
     async saveColumn() {
-      /**
-       * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
-       * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
-       * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
-       */
       const inSave = await this.saveColumnData(
         this.getColumnName(126),
         this.option
       );
       if (inSave) {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+        });
         this.$message.success("保存成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
-        this.$nextTick(() => {
-          this.$refs.crud.doLayout()
-        })
-
       }
     },
     async resetColumn() {
-      this.option = option;
-      const inSave = await this.delColumnData(this.getColumnName(126),option);
+      this.option = this.defaultOption;
+      const inSave = await this.delColumnData(this.getColumnName(126), this.defaultOption);
       if (inSave) {
         this.$nextTick(() => {
           this.$refs.crud.doLayout()

+ 0 - 1
src/views/workManagement/requisition/detail.vue

@@ -242,7 +242,6 @@
               v-if="row.$cellEdit"
               v-model="row.storageId"
               filterable
-              clearable
               @change="storageChange(row)"
             >
               <el-option