Merge remote-tracking branch 'origin/develop' into develop

src/views/basic_data/material/components/modify_list-apply.vue

@@ -75,7 +75,7 @@
       </el-form>
     </div>
     <div class="btn-group clearfixs" v-if="!cid">
-      <el-upload
+      <!-- <el-upload
         class="import-btn"
         :action="baseURL + 'student/import'"
         :http-request="handleImport"
@@ -91,7 +91,7 @@
         type="primary"
         size="small"
         @click="hanleDownloadFiles"
-      >下载模板</el-button>
+      >下载模板</el-button> -->
     </div>
     <div class="mymain-container">
       <!-- 列表 -->
@@ -943,6 +943,7 @@ export default {
       baseURL: '',
       importFileList: [],
       listLoading: false,
+      importLoading:false,
       screenForm: {
         keyword: '',
         specification: '',

src/views/basic_data/material/modify_list.vue

@@ -116,7 +116,7 @@
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fl">
-<!--          <el-button type="primary"  v-if="$checkBtnRole('add', $route.meta.roles)"  icon="el-icon-plus" size="mini" @click="addFn">新增</el-button>-->
+         <el-button type="primary"  v-if="$checkBtnRole('add', $route.meta.roles)"  icon="el-icon-plus" size="mini" @click="addFn">新增</el-button>
           <!-- <el-button type="primary" size="mini">编辑</el-button> -->
           <el-upload
             v-if="$checkBtnRole('add', $route.meta.roles)"
@@ -822,4 +822,8 @@ export default {
 ::v-deep .el-select--small {
   width: 100%;
 }
+.import-btn{
+  display: inline-block;
+    margin: 0 10px;
+}
 </style>

src/views/basic_data/material/price_list.vue

@@ -140,9 +140,18 @@
               >删除</el-button
             >
           </el-popconfirm>
+          <el-button
+        type="primary"
+        style="margin-left:10px"
+              size="mini"
+          @click="handleRevokeAll"
+        >批量作废</el-button>
 <!--        <el-button type="primary" size="mini">导出</el-button>-->
         <!-- <el-button type="primary" size="mini">打印</el-button> -->
       </div>
+      <div class="fl">
+        
+        </div>
     </div>
     <div class="mymain-container">
       <!-- 列表 -->
@@ -465,7 +474,13 @@ export default {
       })
     },
     handleRevoke(id) {
-      handlePriceRevoke({ id }).then((res) => {
+      handlePriceRevoke({ ids:id }).then((res) => {
+        this.$successMsg('操作成功')
+        this.getList()
+      })
+    },
+    handleRevokeAll() {
+      handlePriceRevoke({ ids:this.ids.join('') }).then((res) => {
         this.$successMsg('操作成功')
         this.getList()
       })

src/views/supply/policy/components/retail_form.vue

@@ -331,7 +331,8 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-              {{(scope.row.price -(scope.row.qty * scope.row.discAmount) -(((scope.row.price - scope.row.discAmount) * scope.row.qty * ((scope.row.rebateRate || 0) * 100)) / 100))*scope.row.qty  | numToFixed }}
+             {{ comTatol(scope.row) | numToFixed }}
+              <!-- {{(scope.row.price - (scope.row.qty * scope.row.discAmount) -(((scope.row.price - scope.row.discAmount) * scope.row.qty * ((scope.row.rebateRate || 0) * 100)) / 100))*scope.row.qty  | numToFixed }} -->
               <!-- {{ (((scope.row.price * scope.row.qty) * 100 - ((scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100) * 100 - ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) / 100) | numToFixed }} -->
           </template>
         </el-table-column>
@@ -938,6 +939,12 @@ export default {
     //     },
     //   };
     // },
+    ,
+    comTatol(){
+        return (row)=>{
+          return ((row.price*row.qty) - (row.qty * row.discAmount) -(((row.price - row.discAmount) * row.qty * ((row.rebateRate || 0) * 100)) / 100))
+        }
+    }
   },
   watch: {
     goodsList: {

src/views/supply/price/components/modify_list-apply.vue

@@ -75,7 +75,7 @@
       </el-form>
     </div>
     <div class="btn-group clearfixs" v-if="!cid">
-      <el-upload
+      <!-- <el-upload
         class="import-btn"
         :action="baseURL + 'student/import'"
         :http-request="handleImport"
@@ -93,7 +93,7 @@
         size="small"
         @click="hanleDownloadFiles"
       >下载模板
-      </el-button>
+      </el-button> -->
     </div>
     <div class="mymain-container">
       <!-- 列表 -->
@@ -973,6 +973,8 @@ export default {
       baseURL: '',
       importFileList: [],
       listLoading: false,
+      importLoading:false,
+
       screenForm: {
         keyword: '',
         specification: '',

src/views/supply/price/modify_list.vue

@@ -123,7 +123,7 @@
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fl">
-<!--          <el-button type="primary"  v-if="$checkBtnRole('add', $route.meta.roles)"  icon="el-icon-plus" size="mini" @click="addFn">新增</el-button>-->
+         <el-button type="primary"  v-if="$checkBtnRole('add', $route.meta.roles)"  icon="el-icon-plus" size="mini" @click="addFn">新增</el-button>
           <!-- <el-button type="primary" size="mini">编辑</el-button> -->
           <el-upload
             v-if="$checkBtnRole('add', $route.meta.roles)"
@@ -836,4 +836,8 @@ export default {
 ::v-deep .el-select--small {
   width: 100%;
 }
+.import-btn{
+  display: inline-block;
+    margin: 0 10px;
+}
 </style>

src/views/supply/price/price_list.vue

@@ -140,10 +140,32 @@
               >删除</el-button
             >
           </el-popconfirm>
+          <el-button
+        type="primary"
+        style="margin-left:10px"
+              size="mini"
+          @click="handleRevokeAll"
+        >批量作废</el-button>
 <!--        <el-button type="primary" size="mini">导出</el-button>-->
         <!-- <el-button type="primary" size="mini">打印</el-button> -->
       </div>
+      <div class="fl">
+        <!-- <el-popconfirm
+                style="margin-right: 10px"
+                title="批量作废吗？"
+                @onConfirm="handleRevokeAll"
+              >
+                <el-button
+                  slot="reference"
+                  type="text"
+                  size="mini"
+                >批量作废</el-button>
+
+                </el-popconfirm> -->
+        </div>
     </div>
+           
+ 
     <div class="mymain-container">
       <!-- 列表 -->
       <div class="table">
@@ -466,7 +488,13 @@ export default {
       })
     },
     handleRevoke(id) {
-      handlePriceRevoke({ id }).then((res) => {
+      handlePriceRevoke({ ids:id }).then((res) => {
+        this.$successMsg('操作成功')
+        this.getList()
+      })
+    },
+    handleRevokeAll() {
+      handlePriceRevoke({ ids:this.ids.join('') }).then((res) => {
         this.$successMsg('操作成功')
         this.getList()
       })