Merge branch 'master' of http://121.41.102.225:8099/Nidong/jiufang

src/views/BasicSettings/SuppliersManage/SippliersStockPriceList.vue

@@ -171,8 +171,8 @@ export default {
           break;
         case 2:
           this.$Modal.confirm({
-            title: '确认审核？',
-            content: '此操作将审核订单，请确认！',
+            title: row.state == 0 ?'确认审核？':'确认弃审？',
+            content: row.state == 0 ?'此操作将审核订单，请确认！':'此操作将弃审订单，请确认！',
             onOk: () => {
               this.axios({
                 method: 'post',
@@ -192,7 +192,7 @@ export default {
         case 3:
         case 4:
         case 5:
-          this.handleGoPage(type, row.supply_id)
+          this.handleGoPage(type, row.supply_id,row.state)
           break;
         case 6:
           break;
@@ -217,12 +217,13 @@ export default {
           break;
       }
     },
-    handleGoPage (type, supply_id) {
+    handleGoPage (type, supply_id,state) {
       this.$router.push({
         path: '/cms/BasicSettings/SuppliersManage/SippliersStockPriceListEdit',
         query: {
           type,
           supply_id,
+          state,
         }
       })
     },

src/views/BasicSettings/SuppliersManage/SippliersStockPriceListEdit.vue

@@ -257,30 +257,32 @@ export default {
       }).catch((err) => { });
     },
     initData () {
+
       this.axios({
         method: 'get',
         url: '/api/supply_material_detail',
         params: {
           supply_id: this.$route.query.supply_id
         }
-      }).then((res) => {
+      }).then((res) => {  
         this.searchData.code = res.data.code
         this.searchData.title = res.data.title
         this.tableData = res.data.list
         this.tableData.forEach(element => {
           element.tax_price = (1 * element.price * (1 + element.fax * 1 / 100)).toFixed(2)
         });
-      }).catch((err) => { });
+      }).catch((err) => { }); 
     },
     handleSet (type, row, index) {
       switch (type) {
         case 1:
           this.axios({
             method: 'post',
-            url: '/api/supply_material_add',
+            url: '/api/supply_material_edit',
             data: {
               supply_id: this.$route.query.supply_id ? this.$route.query.supply_id : this.searchData.id,
-              supply_material: this.tableData
+              supply_material: this.tableData,
+              state: this.$route.query.state
             }
           }).then((res) => {
             this.$Message.success(res.msg);