Merge tag 'Hotfix-19' into develop

Finish Hotfix-19

src/views/basic_data/material/material_list.vue

@@ -14,13 +14,29 @@
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="名称" prop="keyword">
                 <el-input
-                  placeholder="请输入名称"
                   v-model="screenForm.keyword"
-                ></el-input>
+                  placeholder="请输入名称"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="物料编码" prop="number">
+                <el-input
+                  v-model="screenForm.number"
+                  placeholder="请输入物料编码"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="金蝶编码" prop="oldNumber">
+                <el-input
+                  v-model="screenForm.oldNumber"
+                  placeholder="请输入金蝶编码"
+                />
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="12" :lg="18" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button size="small" @click="resetScreenForm"
                   >清空</el-button
@@ -54,7 +70,7 @@
               label="使用组织"
               prop="useOrgName"
               min-width="100"
-            ></el-table-column>
+            />
             <el-table-column
               align="center"
               label="编码"
@@ -62,20 +78,20 @@
               min-width="100"
               label-class-name="bianma"
               class-name="fontstyle"
-            ></el-table-column>
+            />
 
             <el-table-column
               align="center"
               label="名称"
               prop="name"
               min-width="100"
-            ></el-table-column>
+            />
             <el-table-column
               align="center"
               label="规格型号"
               prop="specification"
               min-width="100"
-            ></el-table-column>
+            />
             <el-table-column
               align="center"
               label="数据状态"
@@ -83,8 +99,10 @@
               min-width="100"
             >
               <template slot-scope="scope">
-                  <el-tag type="success" v-if="scope.row.forbidStatus=='A'">正常</el-tag>
-                  <el-tag type="danger" v-else>禁用</el-tag>
+                <el-tag v-if="scope.row.forbidStatus == 'A'" type="success"
+                  >正常</el-tag
+                >
+                <el-tag v-else type="danger">禁用</el-tag>
               </template>
             </el-table-column>
             <el-table-column
@@ -92,9 +110,7 @@
               label="是否维护商城资料"
               prop="maintainData"
               min-width="100"
-            >
-
-            </el-table-column>
+            />
             <el-table-column
               align="center"
               label="是否维护内外机档案"
@@ -102,8 +118,10 @@
               min-width="100"
             >
               <template slot-scope="scope">
-                <el-tag type="success" v-if="scope.row.isSheath==true">是</el-tag>
-                <el-tag type="danger" v-else>否</el-tag>
+                <el-tag v-if="scope.row.isSheath == true" type="success"
+                  >是</el-tag
+                >
+                <el-tag v-else type="danger">否</el-tag>
               </template>
             </el-table-column>
             <el-table-column
@@ -111,13 +129,13 @@
               label="基本单位"
               prop="baseUnitId"
               min-width="100"
-            ></el-table-column>
+            />
             <el-table-column
               align="center"
               label="已使用"
               prop="used"
               min-width="100"
-            ></el-table-column>
+            />
             <el-table-column
               align="center"
               label="操作"
@@ -126,10 +144,13 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-              <el-button type="text" class="textColor" @click="hanleDetail(scope.row.id)"
-                >详情</el-button
-              >
-              <!-- <el-button type="text" class="textColor">删除</el-button> -->
+                <el-button
+                  type="text"
+                  class="textColor"
+                  @click="hanleDetail(scope.row.id)"
+                  >详情</el-button
+                >
+                <!-- <el-button type="text" class="textColor">删除</el-button> -->
               </template>
             </el-table-column>
           </el-table>
@@ -137,27 +158,28 @@
         <!-- 分页 -->
         <div class="fr">
           <el-pagination
-            @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
+            :current-page="currentPage"
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
             :total="listTotal"
-          >
-          </el-pagination>
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
         </div>
       </div>
     </div>
-    <MaterialListDetail v-else  :detail='detail'/>
+    <MaterialListDetail v-else :detail="detail" />
   </div>
 </template>
 
 <script>
 import Mixin from "@/mixin/index";
-import { getMaterialList,getMaterialDetail } from "@/api/basic_data/material";
+import { getMaterialDetail, getMaterialList } from "@/api/basic_data/material";
 import MaterialListDetail from "./components/material_list-detail.vue";
+
 export default {
+  components: { MaterialListDetail },
   mixins: [Mixin],
   data() {
     return {
@@ -165,25 +187,27 @@ export default {
       screenForm: {
         // 筛选表单数据
         keyword: "", // 名称
+        number: "",
+        oldNumber: "",
       },
     };
   },
-  components: { MaterialListDetail },
   methods: {
     hanleDetail(id) {
-      getMaterialDetail({id}).then((res)=>{
-            console.log(res);
-            this.detail = res.data
-          this.isShow = false;
-      })
-
+      getMaterialDetail({ id }).then((res) => {
+        console.log(res);
+        this.detail = res.data;
+        this.isShow = false;
+      });
     },
     getList() {
       this.listLoading = true;
-      let params = {
+      const params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         keyword: this.screenForm.keyword,
+        number: this.screenForm.number,
+        oldNumber: this.screenForm.oldNumber,
       };
       getMaterialList(params).then((res) => {
         this.dataList = res.data.records;

src/views/finance/rebate_list.vue

@@ -1,6 +1,21 @@
 <template>
   <div class="app-container">
     <div v-if="showPage == 1">
+      <el-radio-group
+        @change="changeRadioFn"
+        v-model="searchForm.examineStatus"
+        size=""
+      >
+        <el-radio-button label="">全部</el-radio-button>
+        <el-radio-button label="SAVE">保存</el-radio-button>
+        <el-radio-button label="WAIT">待审核</el-radio-button>
+        <el-radio-button label="OK_ONE">初审通过</el-radio-button>
+        <el-radio-button label="FAIL_ONE">初审不通过</el-radio-button>
+        <el-radio-button label="OK">复核通过</el-radio-button>
+        <el-radio-button label="FAIL">复核不通过</el-radio-button>
+        <el-radio-button label="CLOSE">已关闭</el-radio-button>
+      </el-radio-group>
+      <br /><br />
       <!-- 筛选条件 -->
       <div>
         <el-form
@@ -602,6 +617,7 @@ export default {
         customerNumber: "",
         startTime: "",
         endTime: "",
+        examineStatus: "",
       }, //搜索表单
       listLoading: false, // 列表加载loading
       showPage: 1,
@@ -637,6 +653,15 @@ export default {
     }
   },
   methods: {
+    //切换radio获取数据
+    changeRadioFn(v) {
+      this.currentPage = 1;
+      this.getDataList({
+        ...this.searchForm,
+        pageSize: this.pageSize,
+        pageNum: this.currentPage,
+      });
+    },
     //清除
     cancelFn() {
       this.$refs.searchForm.resetFields();
@@ -653,18 +678,27 @@ export default {
     handleSizeChange(val) {
       this.pageSize = val;
       this.currentPage = 1;
-      this.getDataList({ pageNum: 1, pageSize: this.pageSize });
+      this.getDataList({
+        pageNum: 1,
+        pageSize: this.pageSize,
+        ...this.searchForm,
+      });
     },
     // 更改当前页
     handleCurrentChange(val) {
       this.currentPage = val;
-      this.getDataList({ pageNum: val, pageSize: this.pageSize });
+      this.getDataList({
+        pageNum: val,
+        pageSize: this.pageSize,
+        ...this.searchForm,
+      });
     },
     //更新列表数据
     updateList() {
       this.getDataList({
         pageSize: this.pageSize,
         pageNum: this.currentPage,
+        ...this.searchForm,
       });
     },
     //获取列表数据
@@ -723,6 +757,7 @@ export default {
       this.getDataList({
         pageSize: this.pageSize,
         pageNum: this.currentPage,
+        ...this.currentPage,
       });
       this.$message.success("申请成功");
     },