Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!433

src/components/super-table/index.vue

@@ -147,6 +147,15 @@ export default {
         this.filterData = multiFilter(this.$props.value, newValue);
       },
     },
+    value:{
+      handler: function (newValue) {
+        if(this.value.length > 0){
+          this.$refs.superTable.clearSelection();
+        }
+      },
+      immediate: true,
+      deep:true
+    }
   },
   methods: {
     //
@@ -437,7 +446,7 @@ export default {
       }"
     >
       <div class="mr-4">
-        <template v-if="checkbox">
+        <!-- <template v-if="checkbox">
           <el-button
             v-if="selectState"
             size="mini"
@@ -454,7 +463,7 @@ export default {
             选择列
             {{ selectData.length ? ` ：${selectData.length}` : "" }}
           </el-button>
-        </template>
+        </template> -->
         <template v-if="convenitentOperation">
           <button-hide v-model="innerColumns" @change="onHide"></button-hide>
         </template>

src/views/material/classify/index.vue

@@ -10,7 +10,7 @@
           <el-button type="primary" size="mini" plain @click="addClassify">新增</el-button>
           <el-button type="primary" size="mini" plain @click="editClassify">修改</el-button>
           <el-button type="primary" size="mini" plain @click="refreshData">{{refreshName ? '全部分类': '过滤停用'}}</el-button>
-          <el-button type="primary" size="mini" plain @click="deleteClassify">删除</el-button>
+          <!-- <el-button type="primary" size="mini" plain @click="deleteClassify">删除</el-button> -->
         </div>
       </el-row>
 

src/views/purchase/PurchaseDemandList/index.vue

@@ -429,6 +429,8 @@ export default {
           return '已完成'
         case '3':
           return '已驳回'
+        case '9':
+          return '已回退'
       }
     },
     formatterBillType(row) {

src/views/purchase/apply/add/columns.js

@@ -189,7 +189,7 @@ export default function useColumns() {
           item: { key: "taxPrice", title: "含税单价", required: true },
           attr: {
             is: "el-input-number",
-            min: 0,
+            min: 0.01,
             precision: CONFIG.precision,
           },
         },

src/views/purchase/apply/add/index.vue

@@ -152,6 +152,7 @@
         const {TabColumns, TableColumns} = useColumns();
         this.visible = false;
         this.params = this.$init.params([...TabColumns, ...TableColumns]);
+        this.$emit("success");
       },
       //
       async onRowAdd(prop, pushParams = {}) {

src/views/purchase/apply/copy/columns.js

@@ -189,7 +189,7 @@ export default function useColumns() {
           item: { key: "taxPrice", title: "含税单价", required: true },
           attr: {
             is: "el-input-number",
-            min: 0,
+            min: 0.01,
             precision: CONFIG.precision,
           },
         },

src/views/purchase/apply/copy/index.vue

@@ -203,6 +203,7 @@ export default {
       const { TabColumns, TableColumns } = useColumns();
       this.visible = false;
       this.params = this.$init.params([...TabColumns, ...TableColumns]);
+      this.$emit("success");
     },
     //
     async onRowAdd(prop, pushParams = {}) {

src/views/purchase/apply/edit/columns.js

@@ -189,7 +189,7 @@ export default function useColumns() {
           item: { key: "taxPrice", title: "含税单价", required: true },
           attr: {
             is: "el-input-number",
-            min: 0,
+            min: 0.01,
             precision: CONFIG.precision,
           },
         },

src/views/purchase/apply/edit/index.vue

@@ -153,7 +153,6 @@
             updateByName: createByName,
             id: null,
           });
-          console.log('isPriceAdjustment', isPriceAdjustment)
         }
       },
       // 
@@ -215,6 +214,7 @@
         const {TabColumns, TableColumns} = useColumns();
         this.visible = false;
         this.params = this.$init.params([...TabColumns, ...TableColumns]);
+        this.$emit("success");
       },
       //
       async onRowAdd(prop, pushParams = {}) {

src/views/purchase/apply/see/index.vue

@@ -101,6 +101,7 @@ export default {
       } = useColumns();
       this.visible = false;
       this.tabName = tabName;
+      this.$emit("success");
     },
     async jumpOA() {
       toOA(this.$store.state.user.name, this.params.flowId).then(res => {