。。。

src/api/policy_list.js

@@ -0,0 +1,274 @@
+import request from '@/utils/request'
+
+
+// 销售政策
+export function getList(params) {
+  return request({
+    url: '/policy/list',
+    method: 'get',
+    params
+  })
+}
+//新增政策
+export function addPoliy(params) {
+  return request({
+    url: '/policy/add',
+    method: 'post',
+    data: params
+  })
+}
+//新增政策条件
+
+export function addPoliyCondition(params) {
+  return request({
+    url: '/policy/condition/add',
+    method: 'post',
+    data: params
+  })
+}
+//政策条件列表
+export function getConditionList(params) {
+  return request({
+    url: '/policy/condition/list',
+    method: 'get',
+    params
+  })
+}
+
+export function updatePolicy(params) {
+  return request({
+    url: '/policy/update',
+    method: 'post',
+    data: params
+  })
+}
+
+export function deletePolicy(params) {
+  return request({
+    url: '/policy/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function getConditionMaterialDetail(params) {
+  return request({
+    url: '/policy/condition/detail',
+    method: 'get',
+    params
+  })
+}
+//政策条件的机型列表
+export function getConditionMaterialList(params) {
+  return request({
+    url: '/policy/condition/material/list',
+    method: 'get',
+    params
+  })
+}
+//经销商api
+
+export function getCrList(params) {
+  return request({
+    url: '/customer/list',
+    method: 'get',
+    params
+  })
+}
+
+//政策销售商列表
+export function getCustomerList(params) {
+  return request({
+    url: '/policy/customer/list',
+    method: 'get',
+    params
+  })
+}
+//获取销售政策编号
+export function getId(params) {
+  return request({
+    url: '/policy/id',
+    method: 'get',
+    params
+  })
+}
+
+
+
+export function deleteCondition(params) {
+  return request({
+    url: '/policy/condition/delete',
+    method: 'post',
+    params
+  })
+}
+export function toExamine(params) {
+  return request({
+    url: '/policy/examine',
+    method: 'post',
+    params
+  })
+}
+//导入政策货品
+// /policy/material/import
+
+//政策货品列表
+export function getMaterialList(params) {
+  return request({
+    url: '/policy/material/list',
+    method: 'get',
+    params
+  })
+}
+//提审政策
+export function getpolicySubmit(params) {
+  return request({
+    url: '/policy/policy/submit',
+    method: 'post',
+    params
+  })
+}
+
+//删除政策货品
+
+export function deleteMaterialPolicy(params) {
+  return request({
+    url: '/policy/material/delete',
+    method: 'post',
+    params
+  })
+}
+
+//获取经销商详情
+export function getPolicyDetail(params) {
+  return request({
+    url: '/policy/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 对应经销商
+
+export function getCustomerlist(params) {
+  return request({
+    url: '/policy/customer_count/list',
+    method: 'get',
+    params
+  })
+}
+
+export function eidtBatch(params) {
+  return request({
+    url: '/policy/customer_count/batch',
+    method: 'post',
+    params
+  })
+}
+
+
+
+//销售类型
+
+export function getTypeList(params) {
+  return request({
+    url: '/sale/type/list',
+    method: 'get',
+    params
+  })
+}
+
+export function DeleteData(params) {
+  return request({
+    url: '/policy/material/delete',
+    method: 'psot',
+    params
+  })
+}
+
+export function addData(params) {
+  return request({
+    url: '/sale/type/add',
+    method: 'post',
+    data: params
+  })
+}
+
+export function delTypeData(params) {
+  return request({
+    url: '/sale/type/delete',
+    method: 'post',
+    params
+  })
+}
+
+export function getDetail(params) {
+  return request({
+    url: '/sale/type/detail',
+    method: 'post',
+    data: params
+  })
+}
+
+export function updateType(params) {
+  return request({
+    url: '/sale/type/update',
+    method: 'post',
+    data: params
+  })
+}
+
+// 返利钱包列表
+
+export function getWalletList(params) {
+  return request({
+    url: '/wallet/rebate/list',
+    method: 'get',
+    params
+  })
+}
+
+
+export function addWallet(params) {
+  return request({
+    url: '/wallet/add',
+    method: 'post',
+    data: params
+  })
+}
+
+
+export function getWalletDetail(params) {
+  return request({
+    url: '/wallet/rebate/detail',
+    method: 'get',
+    params
+  })
+}
+
+export function updateWallet(params) {
+  return request({
+    url: '/wallet/update',
+    method: 'post',
+    data: params
+  })
+}
+
+
+// 销售品类
+export function getDictList(params) {
+  return request({
+    url: '/common/dict/list',
+    method: 'get',
+    params
+  })
+}
+
+// 产品品类
+export function getProductList(params) {
+  return request({
+    url: '/product-category/list',
+    method: 'get',
+    params
+  })
+}

src/api/supply/sales.js

@@ -9,257 +9,3 @@ export function getList(params) {
     params
   })
 }
-//新增政策
-export function addPoliy(params) {
-  return request({
-    url: '/policy/add',
-    method: 'post',
-    data: params
-  })
-}
-//新增政策条件
-
-export function addPoliyCondition(params) {
-  return request({
-    url: '/policy/condition/add',
-    method: 'post',
-    data: params
-  })
-}
-//政策条件列表
-export function getConditionList(params) {
-  return request({
-    url: '/policy/condition/list',
-    method: 'get',
-    params
-  })
-}
-
-export function updatePolicy(params) {
-  return request({
-    url: '/policy/update',
-    method: 'post',
-    data: params
-  })
-}
-
-export function deletePolicy(params) {
-  return request({
-    url: '/policy/delete',
-    method: 'post',
-    params
-  })
-}
-
-export function getConditionMaterialDetail(params) {
-  return request({
-    url: '/policy/condition/detail',
-    method: 'get',
-    params
-  })
-}
-//政策条件的机型列表
-export function getConditionMaterialList(params) {
-  return request({
-    url: '/policy/condition/material/list',
-    method: 'get',
-    params
-  })
-}
-//经销商api
-
-export function getCrList(params) {
-  return request({
-    url: '/customer/list',
-    method: 'get',
-    params
-  })
-}
-
-//政策销售商列表
-export function getCustomerList(params) {
-  return request({
-    url: '/policy/customer/list',
-    method: 'get',
-    params
-  })
-}
-//获取销售政策编号
-export function getId(params) {
-  return request({
-    url: '/policy/id',
-    method: 'get',
-    params
-  })
-}
-
-
-
-export function deleteCondition(params) {
-  return request({
-    url: '/policy/condition/delete',
-    method: 'post',
-    params
-  })
-}
-export function toExamine(params) {
-  return request({
-    url: '/policy/examine',
-    method: 'post',
-    params
-  })
-}
-//导入政策货品
-// /policy/material/import
-
-//政策货品列表
-export function getMaterialList(params) {
-  return request({
-    url: '/policy/material/list',
-    method: 'get',
-    params
-  })
-}
-//提审政策
-export function getpolicySubmit(params) {
-  return request({
-    url: '/policy/policy/submit',
-    method: 'post',
-    params
-  })
-}
-
-//删除政策货品
-
-export function deleteMaterialPolicy(params) {
-  return request({
-    url: '/policy/material/delete',
-    method: 'post',
-    params
-  })
-}
-
-//获取经销商详情
-export function getPolicyDetail(params) {
-  return request({
-    url: '/policy/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 对应经销商
-
-export function getCustomerlist(params) {
-  return request({
-    url: '/policy/customer_count/list',
-    method: 'get',
-    params
-  })
-}
-
-export function eidtBatch(params) {
-  return request({
-    url: '/policy/customer_count/batch',
-    method: 'post',
-    params
-  })
-}
-
-
-
-//销售类型
-
-export function getTypeList(params) {
-  return request({
-    url: '/sale/type/list',
-    method: 'get',
-    params
-  })
-}
-
-export function DeleteData(params) {
-  return request({
-    url: '/policy/material/delete',
-    method: 'psot',
-    params
-  })
-}
-
-export function addData(params) {
-  return request({
-    url: '/sale/type/add',
-    method: 'post',
-    data: params
-  })
-}
-
-export function delTypeData(params) {
-  return request({
-    url: '/sale/type/delete',
-    method: 'post',
-    params
-  })
-}
-
-export function getDetail(params) {
-  return request({
-    url: '/sale/type/detail',
-    method: 'post',
-    data: params
-  })
-}
-
-export function updateType(params) {
-  return request({
-    url: '/sale/type/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 返利钱包列表
-
-export function getWalletList(params) {
-  return request({
-    url: '/wallet/rebate/list',
-    method: 'get',
-    params
-  })
-}
-
-
-export function addWallet(params) {
-  return request({
-    url: '/wallet/add',
-    method: 'post',
-    data: params
-  })
-}
-
-
-export function getWalletDetail(params) {
-  return request({
-    url: '/wallet/rebate/detail',
-    method: 'get',
-    params
-  })
-}
-
-export function updateWallet(params) {
-  return request({
-    url: '/wallet/update',
-    method: 'post',
-    data: params
-  })
-}
-
-
-// 销售品类
-export function getDictList(params) {
-  return request({
-    url: '/common/dict/list',
-    method: 'get',
-    params
-  })
-}

src/views/basic_data/dealer/dealer_list.vue

@@ -12,10 +12,10 @@
         >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="关键字" prop="keyword">
+              <el-form-item label="名称" prop="keyword">
                 <el-input
                   v-model="searchForm.keyword"
-                  placeholder="请输入关键字"
+                  placeholder="请输入名称"
                 ></el-input>
               </el-form-item>
             </el-col>

src/views/basic_data/logistics/logistics_list.vue

@@ -66,9 +66,9 @@
         <el-button type="primary" size="small" @click="handleExport"
           >导出</el-button
         >
-        <el-button type="primary" size="small" @click="hanlePrint"
+        <!-- <el-button type="primary" size="small" @click="hanlePrint"
           >打印</el-button
-        >
+        > -->
       </div>
     </div>
     <!-- 列表 -->

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

@@ -657,8 +657,8 @@
     <el-dialog title="" :visible.sync="centerDialogVisible" width="80%" center>
       <div>
         <el-form
-          ref="dialogForm"
-          :model="dialogForm"
+          ref="screenForm"
+          :model="screenForm"
           label-width="70px"
           size="small"
           label-position="left"
@@ -668,7 +668,7 @@
               <el-form-item label="名称" prop="keyword">
                 <el-input
                   placeholder="请输入名称"
-                  v-model="dialogForm.keyword"
+                  v-model="screenForm.keyword"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -840,7 +840,7 @@ export default {
       startDate: "",
       userList: [],
       centerDialogVisible: false,
-      dialogForm: {
+      screenForm: {
         keyword: "",
       },
       selectData: [],
@@ -1009,7 +1009,7 @@ export default {
       let params = {
         pageNum: this.currentPage,
         pageSize: 5 || this.pageSize,
-        keyword: this.dialogForm.keyword,
+        keyword: this.screenForm.keyword,
       };
       getMaterialList(params).then((res) => {
         this.dataList = res.data.records;

src/views/basic_data/material/machine_list.vue

@@ -21,25 +21,23 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="型号" prop="model">
               <el-input
-                type="number"
                 placeholder="请输入型号"
-                v-model.number="screenForm.model"
+                v-model="screenForm.model"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="编码" prop="number">
               <el-input
-
                 placeholder="请输入编码"
-                v-model.number="screenForm.number"
+                v-model="screenForm.number"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="体积" prop="volume">
               <el-input
-              type="number"
+                type="number"
                 placeholder="请输入体积"
                 v-model.number="screenForm.volume"
               ></el-input>
@@ -97,7 +95,13 @@
         <el-button type="primary" size="small" @click="handleExport"
           >导出</el-button
         >
-        <el-button  type="primary" size="small" icon="el-icon-printer" v-print="printObj">打 印</el-button>
+        <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-printer"
+          v-print="printObj"
+          >打 印</el-button
+        > -->
       </div>
     </div>
     <div class="mymain-container" id="printMe">
@@ -122,10 +126,15 @@
             min-width="160"
             show-overflow-tooltip
           >
-          <template slot-scope="scope">
-            {{scope.row.type=='INNER'?'内机':scope.row.type=='OUTSIDE'?'外机':'配件'}}
-          </template>
-
+            <template slot-scope="scope">
+              {{
+                scope.row.type == "INNER"
+                  ? "内机"
+                  : scope.row.type == "OUTSIDE"
+                  ? "外机"
+                  : "配件"
+              }}
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
@@ -243,11 +252,12 @@
         ref="diaLogForm"
         :model="diaLogForm"
         label-width="70px"
+        :rules="rules"
         size="small"
         label-position="left"
       >
-        <el-form-item label="类型">
-          <el-select v-model="diaLogForm.type" filterable  placeholder="请选择">
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="diaLogForm.type" filterable placeholder="请选择">
             <el-option
               v-for="item in distList"
               :key="item.dictCode"
@@ -257,21 +267,25 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="名称">
-          <el-input v-model="diaLogForm.name"   type="number" size="normal"></el-input>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="diaLogForm.name" size="normal"></el-input>
         </el-form-item>
-        <el-form-item label="型号">
-          <el-input v-model="diaLogForm.model"   type="number" size="normal"></el-input>
+        <el-form-item label="型号" prop="model">
+          <el-input v-model="diaLogForm.model" size="normal"></el-input>
         </el-form-item>
-        <el-form-item label="编码">
-          <el-input v-model="diaLogForm.number"    size="normal"></el-input>
+        <el-form-item label="编码" prop="number">
+          <el-input v-model="diaLogForm.number" size="normal"></el-input>
         </el-form-item>
-        <el-form-item label="体积">
-          <el-input v-model="diaLogForm.volume"   type="number" size="normal"></el-input>
+        <el-form-item label="体积" prop="volume">
+          <el-input
+            v-model="diaLogForm.volume"
+            type="number"
+            size="normal"
+          ></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="(showDialogForm = false), resetInfo()"
+        <el-button @click="(showDialogForm = false), resetForm(), resetInfo()"
           >取 消</el-button
         >
         <el-button type="primary" @click="hanleInfo">确 定</el-button>
@@ -290,16 +304,16 @@ import {
   getMachineEdit,
   getDistList,
 } from "@/api/basic_data/material";
-import print from 'vue-print-nb'
+import print from "vue-print-nb";
 export default {
   mixins: [Mixin],
-    directives: {
-    print
+  directives: {
+    print,
   },
   data() {
     return {
-       printObj: {
-        id: 'printMe'
+      printObj: {
+        id: "printMe",
       },
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
@@ -335,26 +349,37 @@ export default {
         type: "",
       },
       showDialogForm: false,
-      dataList: [
-
-      ],
+      dataList: [],
       screenForm: {
-        model:'',
+        model: "",
         name: "",
         number: "",
         type: "",
         volume: "",
       },
       type: null,
-      distList:[]
-
+      distList: [],
+      rules: {
+        type: [{ required: true, message: "请选择类型", trigger: "blur" }],
+        name: [{ required: true, message: "请选择名称", trigger: "blur" }],
+        model: [{ required: true, message: "请输入型号", trigger: "blur" }],
+        number: [{ required: true, message: "请输入编码", trigger: "blur" }],
+        volume: [
+          {
+            required: true,
+            message: "请输入体积",
+            type: "number",
+            trigger: "blur",
+          },
+        ],
+      },
     };
   },
   created() {
-     getDistList({ sysDictEnum: "MACHINE_CONFIGURE" }).then((res) => {
-        this.distList = res.data;
-        console.log(res, 123);
-      });
+    getDistList({ sysDictEnum: "MACHINE_CONFIGURE" }).then((res) => {
+      this.distList = res.data;
+      console.log(res, 123);
+    });
   },
   methods: {
     editFn(id, row) {
@@ -369,24 +394,37 @@ export default {
       };
       this.showDialogForm = true;
     },
+    resetForm(formName) {
+      this.$refs.diaLogForm.resetFields();
+    },
     hanleInfo() {
-      if (this.type === 1) {
-        getMachineAdd(this.diaLogForm).then((res) => {
-          this.$successMsg("保存成功");
-          this.getList();
-        });
-      } else if (this.type === 2) {
-        const params = {
-          ...this.diaLogForm,
-        };
-        getMachineEdit(params).then((res) => {
-          this.$successMsg("编辑成功");
-          this.getList();
-        });
-        this.diaLogForm.id = null;
-      }
-      this.resetInfo();
-      this.showDialogForm = false;
+      this.$refs.diaLogForm.validate((valid) => {
+        if (valid) {
+          if (this.type === 1) {
+            getMachineAdd(this.diaLogForm).then((res) => {
+              this.$successMsg("保存成功");
+              this.showDialogForm = false;
+               this.resetInfo();
+              this.getList();
+            });
+          } else if (this.type === 2) {
+            const params = {
+              ...this.diaLogForm,
+            };
+            getMachineEdit(params).then((res) => {
+              this.$successMsg("编辑成功");
+              this.showDialogForm = false;
+               this.resetInfo();
+              this.getList();
+            });
+            this.diaLogForm.id = null;
+          }
+
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
     },
     // 初始化数据
     getList() {
@@ -394,7 +432,7 @@ export default {
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        name: this.screenForm.name ,
+        name: this.screenForm.name,
         number: this.screenForm.number,
         model: this.screenForm.model,
         volume: this.screenForm.volume,
@@ -405,7 +443,6 @@ export default {
         this.listLoading = false;
         console.log(this.dataList, 1233);
       });
-
     },
     // 导入
     async handleImport(param) {

src/views/basic_data/material/modify_list.vue

@@ -100,7 +100,11 @@
             @select="hanleSelectAll"
             stripe
           >
-            <el-table-column type="selection" align="center" width="50"></el-table-column>
+            <el-table-column
+              type="selection"
+              align="center"
+              width="50"
+            ></el-table-column>
             <el-table-column
               align="center"
               label="单据号"
@@ -119,7 +123,7 @@
               align="center"
               label="销售类型"
               prop="saleTypeId"
-                      :formatter="formatterType"
+              :formatter="formatterType"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -251,17 +255,29 @@
             <el-table-column
               align="center"
               label="状态"
-              prop="billFlag"
+              prop="examineStatus"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <el-tag type="success" v-if="scope.row.billFlag == 'A'"
+                <el-tag type="success" v-if="scope.row.examineStatus == 'SAVE'"
                   >保存</el-tag
                 >
-                <el-tag type="danger" v-else-if="scope.row.billFlag == 'B'"
+                <el-tag
+                  type="danger"
+                  v-else-if="scope.row.examineStatus == 'WAIT'"
                   >提交</el-tag
                 >
+                <el-tag
+                  type="danger"
+                  v-else-if="scope.row.examineStatus == 'OK'"
+                  >通过</el-tag
+                >
+                <el-tag
+                  type="danger"
+                  v-else-if="scope.row.examineStatus == 'FAIL'"
+                  >不通过</el-tag
+                >
                 <el-tag type="danger" v-else>审核</el-tag>
               </template>
             </el-table-column>
@@ -318,7 +334,7 @@ import {
   getProductRriceDetail,
   getProductRriceList,
   getProductRricedel,
-  getTypeList
+  getTypeList,
 } from "@/api/basic_data/material";
 import { downloadFiles } from "@/utils/util";
 export default {
@@ -378,7 +394,7 @@ export default {
         startDate: "",
         wallets: [],
       },
-      typeList:[]
+      typeList: [],
     };
   },
   components: {
@@ -386,26 +402,24 @@ export default {
     ModifyListApproval,
     ModifyListDetail,
   },
-  mounted(){
-       let params = {
+  mounted() {
+    let params = {
       pageNum: 1,
       pageSize: -1,
       saleCode: "",
       saleName: "",
       status: "",
     };
-   getTypeList(params).then((res) => {
+    getTypeList(params).then((res) => {
       this.typeList = res.data.records;
     });
   },
   methods: {
-  formatterType(row) {
+    formatterType(row) {
       for (let i = 0; i < this.typeList.length; i++) {
-
-     if (this.typeList[i].id == row.saleTypeId) {
-          return this.typeList[i].saleName
-     }
-
+        if (this.typeList[i].id == row.saleTypeId) {
+          return this.typeList[i].saleName;
+        }
       }
     },
     addFn() {

src/views/basic_data/material/price_list.vue

@@ -94,7 +94,7 @@
     <div class="btn-group clearfix">
       <div class="fr">
         <el-button type="primary" size="small">导出</el-button>
-        <el-button type="primary" size="small">打印</el-button>
+        <!-- <el-button type="primary" size="small">打印</el-button> -->
       </div>
     </div>
     <div class="mymain-container">

src/views/basic_data/material/relation_list.vue

@@ -11,15 +11,22 @@
       >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="materialName">
+            <el-form-item label="产品名称" prop="name">
+
+              <el-input
+                placeholder="请输入产品名称"
+                v-model="screenForm.name"
+              ></el-input>
+<!--
               <el-select placeholder="请选择产品品类" v-model="screenForm.name">
+              <el-option label="默认" value=""></el-option>
                 <el-option
                   v-for="item in materialLis"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.name"
                   :key="item.id"
                 ></el-option>
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -138,9 +145,9 @@
         <el-button type="primary" size="small" @click="handleExport"
           >导出</el-button
         >
-        <el-button type="primary" @click="hanlePrint" size="small"
+        <!-- <el-button type="primary" @click="hanlePrint" size="small"
           >打印</el-button
-        >
+        > -->
       </div>
     </div>
     <div class="mymain-container">
@@ -254,7 +261,7 @@
               <el-button
                 type="text"
                 class="textColor"
-                @click="editFn(scope.row.id, scope.row)"
+                @click="editFn(scope.row.id, scope.row,scope.$index)"
                 >编辑</el-button
               >
               <el-popconfirm
@@ -290,7 +297,6 @@
         </el-pagination>
       </div>
     </div>
-
     <!-- 弹窗 -->
     <el-dialog
       title="产品信息"
@@ -389,10 +395,10 @@
     </el-dialog>
   </div>
 </template>
-<!-- /product-compose/export -->
+
 <script>
 import Mixin from "@/mixin/index";
-import { downloadFiles, handleImport } from "@/utils/util";
+import { downloadFiles } from "@/utils/util";
 import {
   getProductList,
   getProductEdit,
@@ -402,6 +408,7 @@ import {
   getMaterialList,
   getDistList,
 } from "@/api/basic_data/material";
+import { number } from "yargs";
 export default {
   mixins: [Mixin],
   data() {
@@ -576,10 +583,12 @@ export default {
         this.typeList = res.data.records;
       });
     },
+
     hanleType(e) {
+      console.log(e,'type');
       let params2 = {
         pageNum: this.machinePei.currentPage,
-        pageSize: this.machinePei.pageSize,
+        pageSize: -1,
         model: this.machinePei.model,
         name: this.machinePei.name,
         number: this.machinePei.number,
@@ -588,10 +597,11 @@ export default {
       };
       getMachineLlist(params2).then((res) => {
         this.machineList = res.data.records;
-        console.log(1111);
       });
     },
+
     hanleCode(e, i) {
+      console.log(e,'code');
       this.machineList.find((l) => {
         if (l.id == e) {
           this.$set(this.diaLogForm.items, i, {
@@ -601,7 +611,7 @@ export default {
             innerOutsideMachineId: l.id,
             model: l.model,
             name: l.name,
-            number: l.number,
+            number: l.number ||'',
             type: l.type,
             volume: l.volume,
           });
@@ -642,7 +652,7 @@ export default {
         this.listLoading = false;
       });
     },
-    editFn(id, row) {
+    editFn(id, row,index) {
       this.hanleMachine();
       this.type = 2;
       this.diaLogForm = {
@@ -650,25 +660,63 @@ export default {
         id,
         adminCompanyId: row.adminCompanyId,
         materialId: row.materialId,
+        type:row.type,
       };
+      console.log(this.diaLogForm);
+      this.materialLis.find((k) => {
+        if (k.id == row.materialId) {
+          this.diaLogForm.productModel = k.specification;
+          this.diaLogForm.productNumber = k.number;
+          this.diaLogForm.volume = k.volume;
+        }
+      });
+        let params2 = {
+        pageNum: this.machinePei.currentPage,
+        pageSize: this.machinePei.pageSize,
+        model: this.machinePei.model,
+        name: this.machinePei.name,
+        number: this.machinePei.number,
+        type: row.type,
+        volume: this.machinePei.volume,
+      };
+      getMachineLlist(params2).then((res) => {
+        console.log(res.data.records,'kkk');
+        res.data.records.find((l) => {
+        if (l.id == row.number) {
+
+          this.$set(this.diaLogForm.items, index, {
+            id: "",
+            machineConfigureId: l.id,
+            parentId: "",
+            innerOutsideMachineId: l.id,
+            model: l.model,
+            name: l.name,
+            number: l.number,
+            type: l.type,
+            volume: l.volume,
+          });
+        }
+      });
+      });
+
       this.showDialogForm = true;
+
     },
     hanleInfo() {
       if (this.type === 1) {
         this.diaLogForm.id = null;
         this.diaLogForm.adminCompanyId = null;
-
         getProductAdd({ ...this.diaLogForm }).then((res) => {
           this.$successMsg("保存成功");
-          this.getList();
           this.resetInfo();
+          this.getList();
         });
       } else if (this.type === 2) {
         const params = { ...this.diaLogForm };
         getProductEdit(params).then((res) => {
           this.$successMsg("编辑成功");
-          this.getList();
           this.resetInfo();
+          this.getList();
         });
       }
 

src/views/basic_data/supplier/supplier_list.vue

@@ -12,10 +12,10 @@
         >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="关键字" prop="name">
+              <el-form-item label="名称" prop="name">
                 <el-input
                   v-model="searchForm.name"
-                  placeholder="请输入关键字"
+                  placeholder="请输入名称"
                 ></el-input>
               </el-form-item>
             </el-col>

src/views/basic_data/warehouse/warehouse_cost.vue

@@ -100,9 +100,9 @@
         <el-button type="primary" size="small" @click="handleExport"
           >导出</el-button
         >
-        <el-button type="primary" size="small" @click="hanlePrint"
+        <!-- <el-button type="primary" size="small" @click="hanlePrint"
           >打印</el-button
-        >
+        > -->
       </div>
     </div>
 
@@ -381,9 +381,10 @@ export default {
         };
         console.log(params, 78798);
         addToll(params).then((res) => {
+              this.getList();
           this.$successMsg("保存成功");
           this.kong();
-          this.getList();
+
         });
       } else if (this.type === 2) {
         const paramss = {
@@ -391,9 +392,10 @@ export default {
         };
         updateToll(paramss).then((res) => {
           this.$successMsg("编辑成功");
+                this.getList();
           this.kong();
           this.diaLogForm.id = null;
-          this.getList();
+
         });
       }
       this.showDialog = false;

src/views/basic_data/warehouse/warehouse_site.vue

@@ -11,7 +11,7 @@
       >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓库名称" prop="account">
+            <el-form-item label="仓库名称" prop="name">
               <el-input
                 placeholder="请输入仓库名称"
                 v-model="screenForm.name"
@@ -19,10 +19,10 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="仓位名称" prop="nickname">
+            <el-form-item label="仓位名称" prop="stockName">
               <el-input
                 placeholder="请输入仓位名称"
-                v-model="screenForm.storeName"
+                v-model="screenForm.stockName"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -41,7 +41,9 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" size="small" @click="newData(),type=1">新增</el-button>
+        <el-button type="primary" size="small" @click="newData(), (type = 1)"
+          >新增</el-button
+        >
 
         <el-button type="primary" size="small">删除</el-button>
       </div>
@@ -77,12 +79,15 @@
             label="仓位名称"
             prop="kingDeeStocks"
             min-width="400"
-
             show-overflow-tooltip
           >
             <template slot-scope="scope">
               <template v-if="scope.row.kingDeeStocks.length > 0">
-                <el-tag type="danger"  style="margin-right: 10px;" v-for="item in scope.row.kingDeeStocks">
+                <el-tag
+                  type="danger"
+                  style="margin-right: 10px"
+                  v-for="item in scope.row.kingDeeStocks"
+                >
                   {{ item.name }}
                 </el-tag>
               </template>
@@ -153,7 +158,7 @@
               <el-button
                 type="text"
                 class="textColor"
-                @click="editFn(scope.row.id, scope.row),type = 2"
+                @click="editFn(scope.row.id, scope.row), (type = 2)"
                 >编辑</el-button
               >
               <el-popconfirm
@@ -212,7 +217,7 @@
           <el-select
             v-model="diaLogForm.stockIds"
             multiple
-             filterable
+            filterable
             placeholder="请选择"
           >
             <el-option
@@ -294,7 +299,7 @@ export default {
       showDialogForm: false,
       screenForm: {
         name: "",
-        storeName: "",
+        stockName: "",
       },
       screenForm2: {
         // 筛选表单数据
@@ -305,7 +310,6 @@ export default {
     };
   },
   methods: {
-
     newData() {
       this.showDialogForm = true;
       this.type = 1;
@@ -322,20 +326,20 @@ export default {
     //显示编辑，编辑数据初始化
     editFn(id, row) {
       this.type = 2;
-      const arr = []
-       if (row.kingDeeStocks.length>1) {
-         row.kingDeeStocks.forEach(el => {
-           arr.push(el.id)
-      });
+      const arr = [];
+      if (row.kingDeeStocks.length > 0) {
+        row.kingDeeStocks.forEach((el) => {
+          arr.push(el.id);
+        });
       }
-        this.newData()
-       this.diaLogForm = {
+      this.newData();
+      this.diaLogForm = {
         id,
         name: row.name,
         remark: row.remark,
         status: row.status,
         stockCordon: row.stockCordon,
-        stockIds: row.stockIds === undefined ? arr: row.stockIds,
+        stockIds: row.stockIds === undefined ? arr : row.stockIds,
       };
       this.showDialogForm = true;
     },
@@ -348,7 +352,7 @@ export default {
           this.showDialogForm = false;
           this.getList();
         });
-      } else if(this.type ==2) {
+      } else if (this.type == 2) {
         const params = {
           ...this.diaLogForm,
         };
@@ -374,7 +378,7 @@ export default {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         name: this.screenForm.name,
-        storeName: this.screenForm.storeName,
+        stockName: this.screenForm.stockName,
       };
       getListStock(params).then((res) => {
         this.dataList = res.data.records;

src/views/sales_policy/codealer_list.vue

@@ -114,14 +114,14 @@
 </template>
 
 <script>
-import { getCustomerlist } from "@/api/supply/sales";
+import { getCustomerlist } from "@/api/policy_list";
 import Minxin from "@/mixin";
 import Distributor from "./components/Distributor";
 export default {
   mixins: [Minxin],
   data() {
     return {
-      isShow: false,
+      isShow: true,
       input: "",
       dataList: [],
       searchForm: {

src/views/sales_policy/components/AddCondition.vue

@@ -1,7 +1,7 @@
 <template>
   <el-container>
     <el-header height="50px" class="header">
-      <el-page-header @back="handleBack" content="详情页面"> </el-page-header>
+      <el-page-header @back="handleBack" :content="!id? '添加页面':'详情页面'"> </el-page-header>
     </el-header>
     <div class="line">
       <el-divider></el-divider>
@@ -106,7 +106,9 @@
             <el-row>
               <el-row>
                 <el-table style="width: 100%" :data="item" border>
-                  <el-table-column type="selection" width="55" align="center">
+                  <el-table-column type="selection" width="55" align="center" v-if="!id">
+                  </el-table-column>
+                  <el-table-column type="index"  label="序号" width="55" align="center" v-else>
                   </el-table-column>
                   <el-table-column
                     label="货品名称"
@@ -114,7 +116,7 @@
                     align="center"
                     prop="materialName"
                   >
-                    <template slot-scope="scope">{{ scope.row.date }}</template>
+                    <template slot-scope="scope">{{ scope.row.materialName }}</template>
                   </el-table-column>
                   <el-table-column
                     prop="specification"
@@ -134,7 +136,7 @@
             </el-row>
             <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="限定机型">
-                <el-input size="small" v-model="limit"></el-input>
+                <el-input size="small" v-model="limit" :readonly="!id?false:true"></el-input>
               </el-form-item>
             </el-col>
 
@@ -147,6 +149,7 @@
               <el-form-item :label="'配提' + (index + 1) + '比例'">
                 <el-input
                   size="small"
+                  :readonly="!id?false:true"
                   v-model="popArr['line_' + index]"
                 ></el-input>
               </el-form-item>
@@ -367,7 +370,7 @@ import {
   getConditionMaterialList,
   getMaterialList,
   getConditionMaterialDetail,
-} from "@/api/supply/sales";
+} from "@/api/policy_list";
 import TabelTransfer from "./TabelTransfer.vue";
 
 import { mapState } from "vuex";
@@ -381,6 +384,10 @@ export default {
       type: String,
       default: "",
     },
+    policyId:{
+      type:String,
+      default:""
+    }
   },
   data() {
     return {
@@ -442,34 +449,33 @@ export default {
     },
     getCommonApi() {
       if (this.id) {
-        var i = 1;
-        getConditionMaterialDetail({ id: this.id }).then((res) => {
-          console.log(res.data,'id');
-          this.pop = res.data ? res.data.pop:''
-          if (res.data && res.data.pop) {
+        getConditionMaterialDetail({ id: this.policyId }).then((res) => {
+          this.pop = res.data.pop
+
             let pop = res.data.pop.split(":");
             for (let i = 0; i < pop.length; i++) {
-              if (i == 0) {
-                this.limit = pop[i];
-                return;
-              }
-              this.popArr["line_" + i] = pop[i];
+                 if (i == 0) {
+                   this.limit = pop[i];
+                   continue
+               }
+
+              this.$set(this.popArr,`line_${i-1}`,pop[i])
             }
-            while (i <= 2) {
-              getConditionMaterialList({
+            console.log(this.popArr);
+              for (let k = 0; k <pop.length ; k++) {
+               getConditionMaterialList({
                 pageNum: 1,
                 pageSize: -1,
-                policyConditionId: this.id,
-                popType: i,
-              }).then((res) => {
+                policyConditionId:res.data.id,
+                popType: k+1,
+                  }).then((res) => {
+
                 this.conditionBoxs.push(res.data.records);
-                i++;
-              });
+                  });
+              }
+                  console.log(this.conditionBoxs);
 
-              i++;
-            }
-          }
-        });
+        })
       }
     },
     toggleSelection(rows) {

src/views/sales_policy/components/AddPolicy.vue

@@ -284,7 +284,7 @@ import {
   deleteCondition,
   getConditionList,
   deleteMaterialPolicy,
-} from "@/api/supply/sales";
+} from "@/api/policy_list";
 import { downloadFiles, handleImport } from "@/utils/util";
 import Transfer from "./Transfer";
 import AddCondition from "./AddCondition";

src/views/sales_policy/components/Distributor.vue

@@ -205,7 +205,7 @@ import {
   getPolicyDetail,
   getCustomerList,
   eidtBatch,
-} from "@/api/supply/sales";
+} from "@/api/policy_list";
 import Minxin from "@/mixin";
 
 export default {

src/views/sales_policy/components/Examine.vue

@@ -64,9 +64,9 @@
               <!-- <el-button size="small">查看</el-button> -->
             </el-col>
             <el-col :span="12" class="tr">
-              <el-button size="small" @click="$parent.isShow = 10"
+              <!-- <el-button size="small" @click="$parent.isShow = 10"
                 >查看条件</el-button
-              >
+              > -->
             </el-col>
           </el-row>
           <el-divider></el-divider>
@@ -161,7 +161,11 @@
               限定条件{{scope.$index+1}}
             </template>
           </el-table-column>
-
+         <el-table-column  label="操作" align="center"   width="80">
+            <template slot-scope="scope">
+               <el-button type="text" size="small" @click="$parent.isShow = 10,$parent.policyId=scope.row.id " >查看条件</el-button>
+            </template>
+          </el-table-column>
         </el-table>
         <el-row>
           <el-divider></el-divider>
@@ -244,7 +248,7 @@
           </el-row>
           <el-row>
             <el-button type="primary" size="small" @click="handleSubmit"
-              >审核</el-button
+              >审核通过</el-button
             >
           </el-row>
         </div>
@@ -260,7 +264,7 @@ import {
   getCustomerList,
   getConditionList,
   toExamine,
-} from "@/api/supply/sales";
+} from "@/api/policy_list";
 import Minxin from "@/mixin";
 import { ok } from "assert";
 

src/views/sales_policy/components/TabelTransfer.vue

@@ -4,7 +4,7 @@
 
 <script>
 import Minxin from "@/mixin";
-import { getId, getMaterialList } from "@/api/supply/sales";
+import { getId, getMaterialList } from "@/api/policy_list";
 import Pagination from "./Pagination";
 export default {
   mixins: [Minxin],

src/views/sales_policy/components/Transfer.vue

@@ -121,7 +121,7 @@
 
 <script>
 import Minxin from "@/mixin";
-import { getCrList } from "@/api/supply/sales";
+import { getCrList } from "@/api/policy_list";
 export default {
   mixins: [Minxin],
   data() {
@@ -151,7 +151,7 @@ export default {
       const customerParams = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        keyword: this.region == 1 || this.region =='' ? '' : this.keyword,
+        keyword: this.region == 1 || this.region == "" ? "" : this.keyword,
         region: this.region == 1 ? this.keyword : "",
       };
       // 获取经销商列表
@@ -198,7 +198,6 @@ export default {
       }
     },
     handleSubmit() {
-
       this.$emit("handleAddPolicy", this.dataR);
     },
   },

src/views/sales_policy/policy_list.vue

@@ -15,9 +15,9 @@
             </el-col>
 
             <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="remark">
+              <el-form-item label="" prop="title">
                 <el-input
-                  v-model="screenForm.remark"
+                  v-model="screenForm.title"
                   placeholder="销售政策说明"
                   size="small"
                 ></el-input>
@@ -25,9 +25,9 @@
             </el-col>
 
             <el-col :xs="24" :ms="6" :lg="6">
-              <el-form-item label="" prop="title">
+              <el-form-item label="" prop="remark">
                 <el-input
-                  v-model="screenForm.title"
+                  v-model="screenForm.remark"
                   placeholder="表头备注"
                   size="small"
                 ></el-input>
@@ -38,7 +38,7 @@
               <el-form-item label="" prop="startTime1">
                 <el-date-picker
                   v-model="screenForm.startTime1"
-                  type="date"
+                  type="datetime"
                   size="small"
                   placeholder="生效日期"
                 >
@@ -51,7 +51,7 @@
               <el-form-item label="" prop="startTime2">
                 <el-date-picker
                   v-model="screenForm.startTime2"
-                  type="date"
+                  type="datetime"
                   size="small"
                   placeholder="结束日期"
                 >
@@ -63,7 +63,7 @@
               <el-form-item label="" prop="startCreateTime">
                 <el-date-picker
                   v-model="screenForm.startCreateTime"
-                  type="date"
+                  type="datetime"
                   size="small"
                   placeholder="制表日期"
                 >
@@ -181,16 +181,19 @@
             >
             <el-button
               type="text"
-                 v-if="scope.row.examineStatus=='WAIT'"
+              v-if="scope.row.examineStatus == 'WAIT'"
               @click="
-                (isShow = 8), (id = scope.row.id), (code = scope.row.code)
+                (isShow = 8),
+                  (id = scope.row.id),
+                  (policyId = scope.row.policyId),
+                  (code = scope.row.code)
               "
               size="small"
               >审核</el-button
             >
             <!-- </el-popconfirm> -->
             <el-popconfirm
-            v-if="scope.row.examineStatus=='SAVE'"
+              v-if="scope.row.examineStatus == 'SAVE'"
               style="margin-left: 10px"
               title="提审？"
               @onConfirm="handlesubmit(scope.row)"
@@ -215,16 +218,16 @@
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status == '1'">已生效</el-tag>
             <el-tag v-else-if="scope.row.status == '0'">未生效 </el-tag>
-
           </template>
         </el-table-column>
         <el-table-column label="状态" width="120" align="center">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.examineStatus == 'SAVE'">保存</el-tag>
-            <el-tag v-else-if="scope.row.examineStatus == 'WAIT'">待审核 </el-tag>
-              <el-tag v-else-if="scope.row.examineStatus == 'OK'">通过 </el-tag>
-                <el-tag v-else>不通过 </el-tag>
-
+            <el-tag v-else-if="scope.row.examineStatus == 'WAIT'"
+              >待审核
+            </el-tag>
+            <el-tag v-else-if="scope.row.examineStatus == 'OK'">通过 </el-tag>
+            <el-tag v-else>不通过 </el-tag>
           </template>
         </el-table-column>
         <el-table-column
@@ -241,7 +244,7 @@
           align="center"
         >
         </el-table-column>
-        <el-table-column prop="address" label="部门"  align="center">
+        <el-table-column prop="address" label="部门" align="center">
         </el-table-column>
         <el-table-column
           prop="remark"
@@ -250,19 +253,9 @@
           align="center"
         >
         </el-table-column>
-        <el-table-column
-          prop="startTime"
-          label="生效日期"
-
-          align="center"
-        >
+        <el-table-column prop="startTime" label="生效日期" align="center">
         </el-table-column>
-        <el-table-column
-          prop="endTime"
-          label="结束日期"
-
-          align="center"
-        >
+        <el-table-column prop="endTime" label="结束日期" align="center">
         </el-table-column>
         <el-table-column
           prop="createBy"
@@ -302,7 +295,7 @@
     </div>
   </div>
   <AddPolicy v-else-if="isShow == 2" />
-  <AddCondition v-else-if="isShow == 10 " :id="id" />
+  <AddCondition v-else-if="isShow == 10" :id="id" :policyId="policyId" />
   <Examine v-else />
 </template>
 
@@ -313,7 +306,7 @@ import {
   deletePolicy,
   getpolicySubmit,
   toExamine,
-} from "@/api/supply/sales";
+} from "@/api/policy_list";
 import Minxin from "@/mixin";
 import { downloadFiles, handleImport } from "@/utils/util";
 import AddPolicy from "./components/AddPolicy";
@@ -330,6 +323,7 @@ export default {
       id: "",
       code: "",
       codeId: "",
+      policyId: "",
       isShow: 1,
       dataList: [],
       screenForm: {
@@ -378,9 +372,7 @@ export default {
   computed: mapState({
     comCode: (state) => state.sales.code,
   }),
-  watch:{
-
-  },
+  watch: {},
   created() {},
   methods: {
     hanlenewInfo() {
@@ -407,6 +399,7 @@ export default {
       };
       getList(params).then((res) => {
         this.dataList = res.data.records;
+        this.listTotal = res.data.total;
       });
       const paramsType = {
         pageNum: 1,
@@ -460,9 +453,10 @@ export default {
       }
     },
     handlesubmit(e) {
-        getpolicySubmit({ policyId: e.id }).then((res) => {
-          this.$successMsg("已提交");
-        });
+      getpolicySubmit({ policyId: e.id }).then((res) => {
+        this.$successMsg("已提交");
+        this.getList();
+      });
       // if (e.examineStatus == "SAVE") {
 
       // } else {

src/views/sales_rebate/rebate_list.vue

@@ -97,9 +97,7 @@
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
-                disabled
-                :active-value="true"
-                :inactive-value="false"
+    @change="handleSwitch($event,scope.row.walletRebateId)"
                 :active-text="scope.row.status ? '已启用' : '已禁用'"
               >
               </el-switch>
@@ -227,7 +225,7 @@ import {
   updateWallet,
   getWalletList,
   getWalletDetail,
-} from "@/api/supply/sales";
+} from "@/api/policy_list";
 
 export default {
   mixins: [Mixin],
@@ -238,7 +236,7 @@ export default {
         mainName: "",
         saleTypeCode: "",
         saleTypeName: "",
-        status: '',
+        status: "",
       },
       dialogForm: {
         name: "",
@@ -247,7 +245,7 @@ export default {
         saleTypeCode: "",
         saleTypeName: "",
         rabateRate: "",
-        status: '',
+        status: "",
       },
       dataList: [],
       columns: [
@@ -267,7 +265,7 @@ export default {
           widht: 160,
         },
         {
-          prop: "rabateRate",
+          prop: "rebateRate",
           lable: "返利折扣比例",
           widht: 160,
         },
@@ -298,8 +296,8 @@ export default {
         },
       ],
       options: [
-         {
-          value: '',
+        {
+          value: "",
           label: "状态",
         },
         {
@@ -331,15 +329,29 @@ export default {
         this.listLoading = false;
       });
     },
+     handleSwitch(e,walletRebateId){
+        updateWallet({
+        walletRebateId,
+        status: e,
+       }).then((res) => {
+          this.$successMsg("状态已更改");
+          this.hanleReset();
+        });
+    },
     hanleEdit(item) {
+      console.log(item);
       this.dialogForm = {
-        id: item.id,
-        name: item.name,
+        adminCompanyId: item.adminCompanyId,
+        mainId: item.mainId,
         mainName: item.mainName,
+        name: item.name,
+        rabateRate: item.rabateRate,
+        rabateSort: item.rabateSort,
         saleTypeCode: item.saleTypeCode,
+        saleTypeId: item.saleTypeId,
         saleTypeName: item.saleTypeName,
-        rabateRate: item.rabateRate,
         status: item.status,
+        walletRebateId: item.walletRebateId,
       };
       this.getDictList();
       this.dialogVisible = true;
@@ -388,7 +400,7 @@ export default {
         const upParams = {
           ...this.dialogForm,
         };
-        updateType(upParams).then((res) => {
+        updateWallet(upParams).then((res) => {
           this.$successMsg("修改成功");
           this.hanleReset();
         });
@@ -429,7 +441,7 @@ export default {
 </script>
 
 <style scoped>
-
 .el-switch.is-disabled {
   opacity: inherit;
-}</style>
+}
+</style>

src/views/sales_rebate/salestype_list.vue

@@ -4,7 +4,6 @@
       <el-form
         ref="screenForm"
         :model="screenForm"
-
         size="small"
         label-position="left"
       >
@@ -90,7 +89,7 @@
               <div style="z-index: 99">
                 <el-switch
                   v-model="scope.row.status"
-                  disabled
+                  @change="handleSwitch($event,scope.row.id)"
                   :active-text="scope.row.status ? '已启用' : '已禁用'"
                 >
                 </el-switch>
@@ -149,12 +148,16 @@
       </div>
     </div>
     <div>
-      <el-dialog :visible.sync="dialogVisible" width="50%"  @close="resetForm"
-          :close-on-click-modal="false">
+      <el-dialog
+        :visible.sync="dialogVisible"
+        width="50%"
+        @close="resetForm"
+        :close-on-click-modal="false"
+      >
         <el-form
           ref="dialogForm"
           :model="dialogForm"
-           :rules="type==1?rules:''"
+          :rules="type == 1 ? rules : ''"
           label-width="120px"
           size="normal"
         >
@@ -162,10 +165,20 @@
             <el-input v-model="dialogForm.saleCode"></el-input>
           </el-form-item>
           <el-form-item label="销售类型名称" prop="saleName">
-            <el-input v-model="dialogForm.saleName" ></el-input>
+            <el-input v-model="dialogForm.saleName"></el-input>
           </el-form-item>
           <el-form-item label="品类" prop="mainName">
-            <el-input v-model="dialogForm.mainName"></el-input>
+            <el-select v-model="dialogForm.mainName">
+              <el-option
+                v-for="(item, index) in productList"
+                :key="index"
+                :label="item.productCategoryName"
+                :value="item.productCategoryName"
+              >
+              </el-option>
+            </el-select>
+
+            <!-- <el-input v-model="dialogForm.mainName"></el-input> -->
           </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-switch
@@ -178,7 +191,9 @@
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false,resetForm()">取 消</el-button>
+          <el-button @click="(dialogVisible = false), resetForm()"
+            >取 消</el-button
+          >
           <el-button type="primary" @click="handelInfo">确 定</el-button>
         </span>
       </el-dialog>
@@ -195,7 +210,8 @@ import {
   addData,
   updateType,
   getDetail,
-} from "@/api/supply/sales";
+  getProductList,
+} from "@/api/policy_list";
 
 export default {
   mixins: [Mixin],
@@ -280,10 +296,17 @@ export default {
         },
       ],
       rules: {
-        saleCode: [{required: true,message: '请输入销售类型编码', trigger: 'blur'}],
-        saleName: [{required: true,message: '请输入销售类型名称', trigger: 'blur'}],
-           mainName: [{required: true,message: '请输入品类名称', trigger: 'blur'}],
+        saleCode: [
+          { required: true, message: "请输入销售类型编码", trigger: "blur" },
+        ],
+        saleName: [
+          { required: true, message: "请输入销售类型名称", trigger: "blur" },
+        ],
+        mainName: [
+          { required: true, message: "请输入品类名称", trigger: "blur" },
+        ],
       },
+      productList: [],
     };
   },
   methods: {
@@ -301,6 +324,12 @@ export default {
         this.listTotal = res.data.total;
         this.listLoading = false;
       });
+      getProductList({
+        productCategoryName: "",
+        productCategoryNumber: "",
+      }).then((res) => {
+        this.productList = res.data;
+      });
     },
     hanleDatele(id) {
       this.hanleDeleteAllPromise(id).then((ids) => {
@@ -330,26 +359,32 @@ export default {
       };
       this.type = 3;
     },
+    handleSwitch(e,id){
+        updateType({
+        id,
+        status: e,
+       }).then((res) => {
+          this.$successMsg("状态已更改");
+          this.hanleReset();
+        });
+    },
     handelInfo() {
-
       if (this.type == 1) {
-            this.$refs.dialogForm.validate((valid) => {
+        this.$refs.dialogForm.validate((valid) => {
           if (valid) {
-          const params = {
-          ...this.dialogForm,
-        };
-        addData(params).then((res) => {
-          console.log(res);
-          this.$successMsg("添加成功");
-          this.hanleReset();
-
-        });
+            const params = {
+              ...this.dialogForm,
+            };
+            addData(params).then((res) => {
+              console.log(res);
+              this.$successMsg("添加成功");
+              this.hanleReset();
+            });
           } else {
-            console.log('error submit!!');
+            console.log("error submit!!");
             return false;
           }
         });
-
       } else if (this.type == 0) {
         const upParams = {
           ...this.dialogForm,
@@ -358,18 +393,15 @@ export default {
           this.$successMsg("修改成功");
 
           this.hanleReset();
-
         });
       } else {
         this.dialogVisible = false;
       }
     },
-     resetForm(formName) {
-        this.$refs.dialogForm.resetFields();
-
+    resetForm(formName) {
+      this.$refs.dialogForm.resetFields();
     },
     hanleReset() {
-
       this.dialogForm = {
         id: "",
         saleCode: "",