Merge branch 'feature/Feature-basic_data' into develop

src/api/basic_data/material.js

@@ -176,3 +176,31 @@ export function getProductPriceList(params) {
     params
   })
 }
+
+
+export function getTypeList(params) {
+  return request({
+    url:'/sale/type/list',
+    method: 'get',
+    params
+  })
+}
+
+
+export function getTree(params) {
+  return request({
+    url:'/admin/websit/tree',
+    method: 'get',
+    params
+  })
+}
+
+
+
+export function getRebate(params) {
+  return request({
+    url:'/wallet/rebate/list',
+    method: 'get',
+    params
+  })
+}

src/views/basic_data/dealer/dealer_deposit.vue

@@ -46,12 +46,8 @@
     <div class="btn-group clearfix">
       <div class="fl">
         <el-button type="primary" size="small" @click="addFn">新增</el-button>
-        <el-button type="primary" size="small">编辑</el-button>
-        <el-button type="primary" size="small">删除</el-button>
       </div>
       <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>
@@ -70,12 +66,6 @@
         >
           <el-table-column
             align="center"
-            type="index"
-            min-width="160"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            align="center"
             label="经销商编码"
             prop="customerNumber"
             min-width="160"
@@ -105,28 +95,28 @@
           <el-table-column
             align="center"
             label="创建人"
-            prop="createMan"
+            prop="createBy"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
             align="center"
             label="创建时间"
-            prop="createDate"
+            prop="createTime"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
             align="center"
             label="更新人"
-            prop="updateMan"
+            prop="updateBy"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
             align="center"
             label="更新时间"
-            prop="updateDate"
+            prop="updateTime"
             min-width="160"
             show-overflow-tooltip
           />
@@ -181,14 +171,15 @@
       <el-form
         ref="dialogForm"
         :model="dialogForm"
-        label-width="100px"
+        :rules="rules"
+        label-width="110px"
         label-position="right"
       >
-        <el-form-item label="经销商名称">
+        <el-form-item label="经销商名称" prop="customerId">
           <el-select
             class="inputStyle"
             v-model="dialogForm.customerId"
-            placeholder="名称"
+            placeholder="请选择"
           >
             <el-option
               v-for="item in dealerList"
@@ -200,13 +191,18 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="押金比例">
-          <el-input v-model="dialogForm.rate" class="inputStyle"></el-input>
+        <el-form-item label="押金比例" prop="rate">
+          <el-input v-model.number="dialogForm.rate" class="inputStyle">
+            <i class="el-input__icon" slot="suffix">% </i>
+          </el-input>
         </el-form-item>
-        <el-form-item label="押金定额金额">
-          <el-input v-model="dialogForm.amount" class="inputStyle"></el-input>
+        <el-form-item label="押金定额金额" prop="amount">
+          <el-input
+            v-model.number="dialogForm.amount"
+            class="inputStyle"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="开始时间">
+        <el-form-item label="开始时间" prop="startTime">
           <el-date-picker
             class="inputStyle"
             v-model="dialogForm.startTime"
@@ -217,7 +213,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="结束时间">
+        <el-form-item label="结束时间" prop="endTime">
           <el-date-picker
             class="inputStyle"
             v-model="dialogForm.endTime"
@@ -228,7 +224,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="备注">
+        <el-form-item label="备注" prop="remark">
           <el-input
             type="textarea"
             v-model="dialogForm.remark"
@@ -254,9 +250,30 @@ import {
   editDealerDeposit,
   infoDealerDeposit,
 } from "@/api/basic_data/dealer";
+import { number } from "echarts";
 
 export default {
   data() {
+    // var amount = (rule, value, callback) => {
+    //   console.log(rule, value);
+    //   console.log(this.dialogForm);
+    //   if (this.dialogForm.rate !== 0) {
+    //     this.$message.warning("已选押金比例,如需选择定额押金,请把押金比例归零");
+    //     // callback(new Error("已选押金比例,如需选择定额押金,请把押金比例归零"));
+    //   } else {
+    //     callback();
+    //   }
+    // };
+    // var rate = (rule, value, callback) => {
+    //   console.log(rule, value);
+    //   console.log(this.dialogForm);
+    //   if (this.dialogForm.amount !== 0) {
+    //     this.$message.warning("已选定额押金,如需选择押金比例,请把定额押金归零");
+    //     // callback(new Error("已选定额押金,如需选择押金比例,请把定额押金归零"));
+    //   } else {
+    //     callback();
+    //   }
+    // };
     return {
       title: "",
       currentPage: 1, // 当前页码
@@ -267,16 +284,64 @@ export default {
         customerName: "",
       },
       dialogForm: {
-        amount: 0,
+        amount: "",
         customerId: "",
         customerName: "",
         customerNumber: "",
         endTime: "",
 
-        rate: 0,
+        rate: "",
         remark: "",
         startTime: "",
       },
+      rules: {
+        rate: [
+          {
+            pattern: /^(?:[1-9]?\d|100)$/,
+            message: "请输入0-100的数字",
+            trigger: "blur",
+            type: "number",
+            required: true,
+          },
+          // {
+          //   validator: rate,
+          //   trigger: "blur",
+          // },
+        ],
+        amount: [
+          {
+            trigger: "blur",
+            message: "请输入定额押金",
+            type: "number",
+            required: true,
+          },
+          // {
+          //   validator: amount,
+          //   trigger: "blur",
+          // },
+        ],
+        customerId: [
+          {
+            message: "请选择经销商名称",
+            trigger: "blur",
+            required: true,
+          },
+        ],
+        startTime: [
+          {
+            message: "请选择开始时间",
+            trigger: "blur",
+            required: true,
+          },
+        ],
+        endTime: [
+          {
+            message: "请选择结束时间",
+            trigger: "blur",
+            required: true,
+          },
+        ],
+      },
       showDialog: false,
       dataList: [],
       dealerList: [],
@@ -288,18 +353,8 @@ export default {
   },
   methods: {
     //取消
-    cancelFn() {
-      this.dialogForm = {
-        amount: 0,
-        customerId: "",
-        customerName: "",
-        customerNumber: "",
-        endTime: "",
-
-        rate: 0,
-        remark: "",
-        startTime: "",
-      };
+    async cancelFn() {
+      await this.$refs.dialogForm.resetFields();
       this.showDialog = false;
     },
     //编辑
@@ -308,6 +363,7 @@ export default {
       this.title = "编辑经销商工程机配置";
       const res = await infoDealerDeposit({ id });
       this.dialogForm = res.data;
+      this.dialogForm.rate = parseInt(res.data.rate * 100);
       this.showDialog = true;
     },
     //删除
@@ -355,6 +411,15 @@ export default {
       this.listTotal = res.data.total;
     },
     async addDataListFn() {
+      await this.$refs.dialogForm.validate();
+
+      // if (this.dialogForm.rate !== 0) {
+      //   this.dialogForm.amount = 0;
+      // }
+      // if (this.dialogForm.amount !== 0) {
+      //   this.dialogForm.rate = 0;
+      // }
+
       let res = this.dealerList.filter(
         (v) => v.id === this.dialogForm.customerId
       )[0];
@@ -363,12 +428,15 @@ export default {
       this.dialogForm.customerNumber = res.number;
 
       if (this.dialogForm.id) {
-        await editDealerDeposit({ ...this.dialogForm });
+        await editDealerDeposit({
+          ...this.dialogForm,
+          rate: this.dialogForm.rate / 100,
+        });
         this.$message.success("编辑成功");
       } else {
         await getDealerDepositAdd({
           ...this.dialogForm,
-          rate: Number(this.dialogForm.rate),
+          rate: Number(this.dialogForm.rate / 100),
           amount: Number(this.dialogForm.amount),
         });
         this.$message.success("添加成功");

src/views/basic_data/dealer/dealer_list.vue

@@ -43,11 +43,6 @@
             stripe
           >
             <el-table-column
-              type="selection"
-              align="center"
-              min-width="160"
-            ></el-table-column>
-            <el-table-column
               align="center"
               label="客户编码"
               prop="number"
@@ -60,24 +55,28 @@
               label="客户名称"
               prop="name"
               min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="简称"
               prop="shortName"
               min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="单据状态"
               prop="danJuZhuangTai"
               min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               prop="forbidStatus"
               align="center"
               label="禁用状态"
               min-width="160"
+              show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <el-tag type="success" v-if="scope.row.forbidStatus === 'A'"
@@ -91,26 +90,30 @@
             <el-table-column
               align="center"
               label="使用组织"
-              prop="useOrgId"
+              prop="useOrgName"
               min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="审核人"
               prop="shenHeRen"
               min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="审核日期"
               prop="shenHeDate"
               min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="客户分组"
               prop="keHu"
               min-width="160"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"

src/views/basic_data/dealer/dealer_stock.vue

@@ -50,7 +50,7 @@
     <div class="btn-group clearfix">
       <div class="fl">
         <el-button type="primary" size="small" @click="addFn">新增</el-button>
-        <el-button type="primary" size="small">编辑</el-button>
+
         <el-popconfirm @onConfirm="deleFn" title="这是一段内容确定删除吗？">
           <el-button
             type="primary"
@@ -62,8 +62,6 @@
         </el-popconfirm>
       </div>
       <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>
@@ -144,7 +142,6 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-button type="text" class="textColor">编辑</el-button>
               <el-popconfirm
                 @onConfirm="deleFn(scope.row.id)"
                 title="这是一段内容确定删除吗？"
@@ -182,11 +179,12 @@
     >
       <el-form
         ref="addForm"
+        :rules="rules"
         :model="addForm"
         label-width="100px"
         label-position="right"
       >
-        <el-form-item label="经销商名称">
+        <el-form-item label="经销商名称" prop="customerId">
           <el-select
             class="selectStyle"
             v-model="addForm.customerId"
@@ -201,7 +199,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="存货分类">
+        <el-form-item label="存货分类" prop="mainId">
           <el-select
             class="selectStyle"
             v-model="addForm.mainId"
@@ -218,7 +216,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogForm = false">取 消</el-button>
+        <el-button @click="cancelFn">取 消</el-button>
         <el-button type="primary" @click="addDataListFn">确 定</el-button>
       </div>
     </el-dialog>
@@ -233,7 +231,7 @@ import {
   getDictionaries,
 } from "@/api/basic_data/dealer";
 import { getDealerList } from "@/api/basic_data/dealer";
-import { findElem } from "@/utils/util";
+
 export default {
   data() {
     return {
@@ -245,6 +243,15 @@ export default {
         mainId: "",
         mainName: "",
       },
+      rules: {
+        mainId: [
+          { required: true, message: "请选择存货分类", trigger: "change" },
+        ],
+        customerId: [
+          { required: true, message: "请选择经销商", trigger: "change" },
+        ],
+      },
+
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
@@ -295,8 +302,8 @@ export default {
       this.dialogForm = true;
     },
     async addDataListFn() {
-      console.log(this.dealerList);
-      console.log(this.addForm.customerId);
+      await this.$refs.addForm.validate();
+
       // let id = this.dealerList.filter((i) => {
       //   return i.id === this.addForm.customerId;
       // })[0];
@@ -318,9 +325,15 @@ export default {
 
       await getDealerStockAdd({ ...this.addForm });
       this.$message.success("添加成功");
+      await this.$refs.addForm.resetFields();
       await this.getList({ pageNum: 1, pageSize: 10 });
       this.dialogForm = false;
     },
+    //取消
+    async cancelFn() {
+      await this.$refs.addForm.resetFields();
+      this.dialogForm = false;
+    },
     //获取经销商数据
     async getDealerDataList(data) {
       const res = await getDealerList(data);

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

@@ -8,58 +8,68 @@
       <el-form label-width="100px" size="small" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="单据编号" prop="account">
-              <el-input placeholder="请输入"></el-input>
+            <el-form-item label="单据编号" >
+              <el-input
+                placeholder="请输入"
+                disabled
+                v-model="base.billId"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="调价日期" prop="account">
+            <el-form-item label="调价日期" >
               <el-date-picker
-                v-model="value1"
-                type="date"
-                placeholder="选择日期"
+                v-model="base.startDate"
+                type="datetime"
+                disabled
+                placeholder="请输入调价日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="调价部门" prop="account">
-              <el-input placeholder="请输入"></el-input>
+            <el-form-item label="调价部门" >
+              <el-input placeholder="请输入" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="调价业务员" prop="account">
-              <el-input placeholder="请输入"></el-input>
+            <el-form-item label="调价业务员" >
+              <el-input placeholder="请输入" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="制单日期" prop="account">
+            <el-form-item label="制单日期" >
               <el-date-picker
-                v-model="value1"
-                type="date"
-                placeholder="选择日期"
+                v-model="startDate"
+                disabled
+                type="datetime"
+                placeholder="请输入制单日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="销售类型" prop="account">
-              <el-select placeholder="请选择活动区域">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+            <el-form-item label="销售类型" >
+              <el-select placeholder="请选择销售类型" v-model="saleTypeId">
+                <el-option  v-for="item in typeList" :label="item.name" :value="item.name"></el-option>
+
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="文件编码" prop="account">
-              <el-input placeholder="请输入"></el-input>
+            <el-form-item label="文件编码" >
+              <el-input placeholder="请输入" v-model="base.remark"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="" class="fr">
               <el-button size="small">清空</el-button>
-              <el-button size="small" type="primary">提交</el-button>
+              <el-button size="small" type="primary" @click="hanleSbumit"
+                >提交</el-button
+              >
             </el-form-item>
           </el-col>
         </el-row>
@@ -67,163 +77,498 @@
     </div>
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" size="small">添加</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          @click="centerDialogVisible = true ,getMaterialList()"
+          >添加</el-button
+        >
       </div>
     </div>
     <div class="mymain-container">
       <!-- 列表 -->
+
       <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-        >
-          <el-table-column
-            align="center"
-            label="操作类型"
-            prop="nname"
-            min-width="160"
-            show-overflow-tooltip
-          >
-            <el-button type="text" class="textColor">修改</el-button>
-            <el-button type="text" class="textColor">删除</el-button>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="销售类型"
-            prop="SalesType"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="存货编码"
-            prop="code"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="存货名称"
-            prop="name"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="规格型号"
-            prop="model"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="计量单位"
-            prop="company"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="批发价"
-            prop="wholesale"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="零售价"
-            prop="retail"
-            min-width="160"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="返利使用比例"
-            prop="rebate"
-            min-width="160"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="生效日期"
-            prop="effectiveDate"
-            min-width="160"
-            show-overflow-tooltip
+        <el-form :model="items" ref="form" size="small" label-position="left">
+          <el-table
+            v-loading="listLoading"
+            :data="items"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
           >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="失效日期"
-            prop="expiryDate"
-            min-width="160"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="是否促销价"
-            prop="promotion"
-            min-width="160"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="数量"
-            prop="number"
-            min-width="160"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="发布"
-            prop="release"
-            min-width="160"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-        </el-table>
+            <el-table-column
+              align="center"
+              label="操作类型"
+              prop="nname"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <!-- <el-button type="text" class="textColor">修改</el-button> -->
+              <el-button type="text" class="textColor">删除</el-button>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="销售类型"
+              prop="saleTypeId"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-form-item>
+                   <el-select placeholder="请选择销售类型" v-model="scope.row.saleTypeId">
+                <el-option  v-for="item in typeList" :label="item.name" :value="item.id"></el-option>
+
+              </el-select>
+
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="存货编码"
+              prop="materialNumber"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.materialNumber"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="存货名称"
+              prop="materialName"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.materialName"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="规格型号"
+              prop="specification"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.specification"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="计量单位"
+              prop="company"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.SalesType"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="批发价"
+              prop="batchPrice"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.batchPrice"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="零售价"
+              prop="retailPrice"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.retailPrice"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="返利使用比例"
+              prop="rebateUseRate"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.rebateUseRate"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="生效日期"
+              prop="startDate"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-date-picker
+                    v-model="scope.row.startDate"
+                    type="date"
+                    placeholder="请输入调价日期"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="失效日期"
+              prop="endDate"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-date-picker
+                    v-model="scope.row.endDate"
+                    type="date"
+                    placeholder="请输入调价日期"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="是否促销价"
+              prop="isPromote"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-select
+                    v-model="scope.row.isPromote"
+                    @change="hanleChange"
+                    placeholder="请选择是否促销价"
+                  >
+                    <el-option
+                      v-for="item in scope.row.isPromoteArr"
+                      :key="item.bool"
+                      :value="item.bool"
+                      :label="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="数量"
+              prop="qty"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-input v-model="scope.row.qty"></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="支付钱包类型"
+              prop="wallets"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-select
+                    v-model="scope.row.isPublish"
+                    @change="hanleChange"
+                    placeholder="请选择支付钱包类型"
+                  >
+                    <el-option
+                      v-for="item in scope.row.rebateList"
+                      :key="item.bool"
+                      :value="item.bool"
+                      :label="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="发布"
+              prop="isPublish"
+              min-width="160"
+              show-overflow-tooltip
+              ><template slot-scope="scope">
+                <el-form-item>
+                  <el-select
+                    v-model="scope.row.isPublish"
+                    @change="hanleChange"
+                    placeholder="请选择是否发布"
+                  >
+                    <el-option
+                      v-for="item in scope.row.isPublishArr"
+                      :key="item.bool"
+                      :value="item.bool"
+                      :label="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+
+        <el-dialog
+          title="提示"
+          :visible.sync="centerDialogVisible"
+          width="50%"
+          center
+          class="dia"
+        >
+        <el-form :model="form" ref="form" :rules="rules" label-width="80px" :inline="false" size="normal">
+          <el-form-item label="产品类型">
+             <el-select v-model="materialId" placeholder="请选择" width="100%">
+            <el-option
+              v-for="item in materialLis"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+          </el-form-item>
+
+        </el-form>
+
+
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="centerDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="hanleAdd">确 定</el-button>
+          </span>
+        </el-dialog>
       </div>
     </div>
   </div>
 </template>
 
 <script>
+import {
+  getProductRriceAdd,
+  getProductRriceConfirm,
+  getProductRriceDetail,
+  getProductRriceEdit,
+  getProductRriceList,
+  getProductRriceRevoke,
+  getProductRriceSubmit,
+  getTypeList,
+  // getTree,
+  getMaterialList,
+  getRebate
+} from "@/api/basic_data/material";
+import { thisTypeAnnotation } from "@babel/types";
 export default {
   data() {
     return {
-      dataList: [
-        {
-          SalesType: "*一票机*",
-          code: "23022051775",
-          name: "夏之凉变频1",
-          model: "KFR-26GW",
-          company: "套",
-          wholesale: "2999",
-          retail: "2899",
-          rebate: "0.8",
-          effectiveDate: "2021-11-02",
-          expiryDate: "2021-11-02",
-          promotion: "否",
-          number: "51",
-          release: "是",
-        },
+      base: {
+        adminCompanyId: "5454",
+        adminWebsitId: "345",
+        billId: "34324",
+        examineNote: "234",
+        examineResult: true,
+        examineStatus: "2342",
+        id: null,
+        operatorId: "234",
+        operatorName: "3223",
+        remark: "2332",
+        saleTypeId: "2332",
+      },
+      items: [
+
       ],
+      centerDialogVisible: false,
+      materialLis:[],
+      materialId:'',
+      rebateList:[],
+      typeList:[],
+      saleTypeId:'',
+      remark:''
     };
   },
+  mounted() {
+       let params={
+        pageNum:1,
+       pageSize:10,
+       saleCode:'',
+       saleName:'',
+       status:1
+      }
+    getTypeList(params).then(res=>{
+      this.typeList = res.data.records
+    })
+  },
   methods: {
+    hanleChange(e) {
+      console.log(e);
+    },
     goBack() {
-      console.log(this.$parent);
       this.$parent.show = 1;
     },
+    getMaterialList(){
+      let rebateParams={
+        pageNum:1,
+       pageSize:10,
+       mainName:'',
+       saleTypeCode:'',
+       saleTypeName:'',
+       status:1
+      }
+      getRebate(rebateParams).then(res=>{
+          this.rebateList = res.data.records
+      })
+       let params = {
+        pageNum:1,
+        pageSize: 10,
+        keyword: '',
+      };
+      getMaterialList(params).then((res) => {
+        this.materialLis = res.data.records;
+
+      });
+
+    },
+    hanleAdd() {
+      this.centerDialogVisible = false;
+      this.items.push({
+        baseUnitId: "",
+        batchPrice: "",
+        billId: "",
+        endDate: "",
+        id: null,
+        isPromote: "",
+        isPublish: "",
+        materialId: this.materialId,
+        materialName: "",
+        materialNumber: "",
+        parentId: "",
+        qty: "",
+        rebateUseRate: "",
+        retailPrice: "",
+        saleTypeId: this.saleTypeId,
+        specification: "",
+        startDate: "",
+        wallets: [
+          {
+                 billId:'44',
+                 id:'55',
+                mainId:'',
+              parentId:'',
+               parentItemId:''
+          }
+        ],
+        rebateList:this.rebateList,
+        isPublishArr: [
+          {
+            value: "是",
+            bool: 1,
+          },
+          {
+            value: "否",
+            bool: 0,
+          },
+        ],
+        isPromoteArr: [
+          {
+            value: "是",
+            bool: 1,
+          },
+          {
+            value: "否",
+            bool: 0,
+          },
+        ],
+      });
+    },
+    hanleSbumit() {
+      const params = {
+        ...this.base,
+        items: this.items,
+      };
+      getProductRriceAdd(params).then((res) => {
+        this.items = {
+          baseUnitId: "32",
+          batchPrice: "23",
+          billId: "",
+          endDate: "",
+          id: null,
+          isPromote: "",
+          isPublish: "",
+          materialId: "",
+          materialName: "",
+          materialNumber: "",
+          parentId: "",
+          qty: "",
+          rebateUseRate: "",
+          retailPrice: "",
+          saleTypeId: "",
+          specification: "",
+          startDate: "",
+          wallets: [],
+          isPublishArr: [
+            {
+              value: "是",
+              bool: 1,
+            },
+            {
+              value: "否",
+              bool: 0,
+            },
+          ],
+          isPromoteArr: [
+            {
+              value: "是",
+              bool: 1,
+            },
+            {
+              value: "否",
+              bool: 0,
+            },
+          ],
+        };
+        this.base = {
+          adminCompanyId: "5454",
+          adminWebsitId: "345",
+          billId: "34324",
+          examineNote: "234",
+          examineResult: true,
+          examineStatus: "2342",
+          id: null,
+          operatorId: "234",
+          operatorName: "3223",
+          remark: "2332",
+          saleTypeId: "2332",
+        };
+      });
+    },
   },
 };
 </script>
@@ -232,4 +577,7 @@ export default {
 ::v-deep .el-date-editor--date {
   width: 100%;
 }
-</style>
+.dia .el-select--normal{
+  width: 100%;
+}
+</style>

src/views/basic_data/material/machine_list.vue

@@ -321,12 +321,12 @@
         <el-form-item label="外机体积">
           <el-input v-model="diaLogForm.outsideMachineVolume"></el-input>
         </el-form-item>
-        <!-- <el-form-item label="配件1">
-          <el-input v-model="diaLogForm.alert"></el-input>
+        <el-form-item label="配件1">
+          <el-input v-model="diaLogForm.parts1"></el-input>
         </el-form-item>
         <el-form-item label="配件2">
-          <el-input v-model="diaLogForm.alert"></el-input>
-        </el-form-item> -->
+          <el-input v-model="diaLogForm.parts2"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="(showDialogForm = false), resetInfo()"
@@ -378,6 +378,8 @@ export default {
       ],
       diaLogForm: {
         id: null,
+        parts1:'',
+        parts2:"",
         innerMachineName: "",
         innerMachineNumber: "",
         innerMachineType: "",
@@ -485,6 +487,8 @@ export default {
       this.type=2
       this.diaLogForm = {
         id,
+        parts1:row.parts1,
+        parts2:row.parts2,
         innerMachineName: row.innerMachineName,
         innerMachineNumber: row.innerMachineNumber,
         innerMachineType: row.innerMachineType,

src/views/basic_data/material/modify_list.vue

@@ -3,30 +3,45 @@
     <div v-if="show === 1">
       <!-- 筛选条件 -->
       <div>
-        <el-form     ref="screenForm"
-        :model="screenForm"
-        label-width="70px"
-        size="small"
-        label-position="left">
+        <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="70px"
+          size="small"
+          label-position="left"
+        >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="存货编码" prop="materialNumber">
-                <el-input placeholder="请输入存货编码" v-model="screenForm.materialNumber"></el-input>
+                <el-input
+                  placeholder="请输入存货编码"
+                  v-model="screenForm.materialNumber"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="存货名称" prop="materialName">
-                <el-input placeholder="请输入存货名称" v-model="screenForm.materialName"></el-input>
+                <el-input
+                  placeholder="请输入存货名称"
+                  v-model="screenForm.materialName"
+                ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
+            <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="存货代码" prop="account">
                 <el-input placeholder="请输入存货代码" v-model="screenForm.account"></el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="生效日期" prop="startDate">
-                <el-input placeholder="请输入生效日期"  v-model="screenForm.startDate"></el-input>
+                <el-date-picker
+                  v-model="screenForm.startDate"
+                  type="datetime"
+                  placeholder="请输入生效日期"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                >
+                </el-date-picker>
+                <!-- <el-input placeholder="请输入生效日期"  v-model="screenForm.startDate"></el-input> -->
               </el-form-item>
             </el-col>
 
@@ -66,6 +81,8 @@
             border
             fit
             highlight-current-row
+            @select-all="hanleSelectAll"
+            @select="hanleSelectAll"
             stripe
           >
             <el-table-column type="selection" align="center"></el-table-column>
@@ -114,7 +131,7 @@
             <el-table-column
               align="center"
               label="规格型号"
-              prop="specs"
+              prop="specification"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -169,12 +186,19 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-               <el-tag type="success" v-if="scope.row.isPromote">是</el-tag>
-                 <el-tag type="danger" v-else>否</el-tag>
+                <el-tag type="success" v-if="scope.row.isPromote">是</el-tag>
+                <el-tag type="danger" v-else>否</el-tag>
               </template>
             </el-table-column>
             <el-table-column
               align="center"
+              label="支付钱包"
+              prop="modifyPriceDepartment"
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
               label="调价部门"
               prop="modifyPriceDepartment"
               min-width="160"
@@ -215,12 +239,15 @@
               min-width="160"
               show-overflow-tooltip
             >
-               <template slot-scope="scope">
-               <el-tag type="success" v-if="scope.row.billFlag =='A'">保存</el-tag>
-                 <el-tag type="danger" v-else-if="scope.row.billFlag =='B'">提交</el-tag>
-                  <el-tag type="danger" v-else>审核</el-tag>
+              <template slot-scope="scope">
+                <el-tag type="success" v-if="scope.row.billFlag == 'A'"
+                  >保存</el-tag
+                >
+                <el-tag type="danger" v-else-if="scope.row.billFlag == 'B'"
+                  >提交</el-tag
+                >
+                <el-tag type="danger" v-else>审核</el-tag>
               </template>
-
             </el-table-column>
             <el-table-column
               align="center"
@@ -229,12 +256,18 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                 <el-button type="text" class="textColor" @click="approvalFn(scope.row.id)"
-                >审批</el-button
-              >
-              <el-button type="text" class="textColor" @click="detailFn(scope.row.id)"
-                >详情</el-button
-              >
+                <el-button
+                  type="text"
+                  class="textColor"
+                  @click="approvalFn(scope.row.id)"
+                  >审批</el-button
+                >
+                <el-button
+                  type="text"
+                  class="textColor"
+                  @click="detailFn(scope.row.id)"
+                  >详情</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -242,8 +275,8 @@
         <!-- 分页 -->
         <div class="fr">
           <el-pagination
-              @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
@@ -255,129 +288,82 @@
       </div>
     </div>
     <ModifyListApply v-else-if="show === 2" />
-    <ModifyListApproval v-else-if="show === 3" :detail="detail"/>
+    <ModifyListApproval v-else-if="show === 3" :detail="detail" />
     <ModifyListDetail v-else :detail="detail" />
   </div>
 </template>
 
 <script>
-
 import ModifyListApply from "./components/modify_list-apply.vue";
 import ModifyListApproval from "./components/modify_list-approval.vue";
 import ModifyListDetail from "./components/modify_list-detail.vue";
 import Mixin from "@/mixin/index";
 import {
- getProductRriceAdd,getProductRriceConfirm,getProductRriceDetail,
- getProductRriceEdit,getProductRriceList,getProductRriceRevoke,
- getProductRriceSubmit
+  getProductRriceAdd,
+  getProductRriceConfirm,
+  getProductRriceDetail,
+  getProductRriceEdit,
+  getProductRriceList,
+  getProductRriceRevoke,
+  getProductRriceSubmit,
 } from "@/api/basic_data/material";
 import { downloadFiles } from "@/utils/util";
 export default {
   mixins: [Mixin],
   data() {
     return {
-      show: 3,
+      show: 1,
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
-
       dataList: [
         {
-          billNnmber: "00000000121213",
-          modifyPriceDate: "2022-03-10",
-          saleType: "*一票机*",
-          productCategory: "家用空调",
-          code: "2022051775",
-          name: "夏之凉变频1",
-          specs: "KFR-26GW/",
-          company: "套",
-          number: "500",
-          wholesale: "2899",
-          retailPrice: "2999",
-          effectiveDate: "2022-05-30",
-          expiryDate: "2022-06-30",
-          promotion: "是",
-          modifyPriceDepartment: "销售部",
-          modifyPriceSalesman: "张三",
-          preparationDate: "2022-05-18",
-          examineUser: "admin",
-          examineDate: "2022-05-18",
-          state: "已通过",
-        },
-        {
-          billNnmber: "00000000121213",
-          modifyPriceDate: "2022-03-10",
-          saleType: "*一票机*",
-          productCategory: "家用空调",
-          code: "2022051775",
-          name: "夏之凉变频1",
-          specs: "KFR-26GW/",
-          company: "套",
-          number: "500",
-          wholesale: "2899",
-          retailPrice: "2999",
-          effectiveDate: "2022-05-30",
-          expiryDate: "2022-06-30",
-          promotion: "是",
-          modifyPriceDepartment: "销售部",
-          modifyPriceSalesman: "张三",
-          preparationDate: "2022-05-18",
-          examineUser: "admin",
-          examineDate: "2022-05-18",
-          state: "已通过",
-        },
-        {
-          billNnmber: "00000000121213",
-          modifyPriceDate: "2022-03-10",
-          saleType: "*一票机*",
-          productCategory: "家用空调",
-          code: "2022051775",
-          name: "夏之凉变频1",
-          specs: "KFR-26GW/",
-          company: "套",
-          number: "500",
-          wholesale: "2899",
-          retailPrice: "2999",
-          effectiveDate: "2022-05-30",
-          expiryDate: "2022-06-30",
-          promotion: "是",
-          modifyPriceDepartment: "销售部",
-          modifyPriceSalesman: "张三",
-          preparationDate: "2022-05-18",
-          examineUser: "admin",
-          examineDate: "2022-05-18",
-          state: "已通过",
-        },
-        {
-          billNnmber: "00000000121213",
-          modifyPriceDate: "2022-03-10",
-          saleType: "*一票机*",
-          productCategory: "家用空调",
-          code: "2022051775",
-          name: "夏之凉变频1",
-          specs: "KFR-26GW/",
-          company: "套",
-          number: "500",
-          wholesale: "2899",
-          retailPrice: "2999",
-          effectiveDate: "2022-05-30",
-          expiryDate: "2022-06-30",
-          promotion: "是",
-          modifyPriceDepartment: "销售部",
-          modifyPriceSalesman: "张三",
-          preparationDate: "2022-05-18",
-          examineUser: "admin",
-          examineDate: "2022-05-18",
-          state: "已通过",
+          baseUnitId: "",
+          batchPrice: "",
+          billId: "",
+          endDate: "",
+          id: null,
+          isPromote: "",
+          isPublish: "",
+          materialId: "",
+          materialName: "",
+          materialNumber: "",
+          parentId: "",
+          qty: "",
+          rebateUseRate: "",
+          retailPrice: "",
+          saleTypeId: "",
+          specification: "",
+          startDate: "",
+          wallets: [],
         },
       ],
-        searchForm: {
+      screenForm: {
         materialName: "",
         materialNumber: "",
         startDate: "",
-
       },
-      detail:{}
+      detail: {},
+      obj:{
+          baseUnitId: "",
+          batchPrice: "",
+          billId: "",
+          endDate: "",
+          id: null,
+          isPromote: "",
+          isPublish: "",
+          materialId: "",
+          materialName: "",
+          materialNumber: "",
+          parentId: "",
+          qty: "",
+          rebateUseRate: "",
+          retailPrice: "",
+          saleTypeId: "",
+          specification: "",
+          startDate: "",
+          wallets: [],
+        }
     };
   },
   components: {
@@ -390,29 +376,26 @@ export default {
       this.show = 2;
     },
     approvalFn() {
-  getProductRriceDetail({id}).then(res=>{
-        this.detail = res.data
-          this.show = 3;
-      })
-
+      getProductRriceDetail({ id }).then((res) => {
+        this.detail = res.data;
+        this.show = 3;
+      });
     },
     detailFn(id) {
-      getProductRriceDetail({id}).then(res=>{
-        this.detail = res.data
+      getProductRriceDetail({ id }).then((res) => {
+        this.detail = res.data;
         this.show = 4;
-      })
-
-
+      });
     },
     getList() {
       this.listLoading = true;
+      console.log(456654);
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        materialName: this.searchForm.materialName,
-        materialNumber: this.searchForm.materialNumber,
-        startDate: this.searchForm.startDate,
-
+        materialName: this.screenForm.materialName,
+        materialNumber: this.screenForm.materialNumber,
+        startDate: this.screenForm.startDate,
       };
       getProductRriceList(params).then((res) => {
         this.dataList = res.data.records;
@@ -459,7 +442,7 @@ export default {
         });
       });
     },
-        handleExport() {
+    handleExport() {
       let screenData = {
         customerName: this.screenForm.customerName,
         freeDay: this.screenForm.freeDay,

src/views/basic_data/material/price_list.vue

@@ -2,53 +2,80 @@
   <div class="app-container">
     <!-- 筛选条件 -->
     <div>
-      <el-form    ref="screenForm"
+      <el-form
+        ref="screenForm"
         :model="screenForm"
         label-width="70px"
         size="small"
-        label-position="left">
+        label-position="left"
+      >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="存货编码" prop="account">
-              <el-input placeholder="请输入存货编码" v-model="screenForm.materialNumber"></el-input>
+            <el-form-item label="存货编码" prop="materialNumber">
+              <el-input
+                placeholder="请输入存货编码"
+                v-model="screenForm.materialNumber"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="存货名称" prop="nickname">
-              <el-input placeholder="请输入存货名称" v-model="screenForm.materialName"></el-input>
+            <el-form-item label="存货名称" prop="materialName">
+              <el-input
+                placeholder="请输入存货名称"
+                v-model="screenForm.materialName"
+              ></el-input>
             </el-form-item>
           </el-col>
-          <!-- <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="存货代码" prop="account">
-              <el-input placeholder="请输入存货代码" v-model="screenForm.materialNumber"></el-input>
-            </el-form-item>
-          </el-col> -->
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="生效日期" prop="nickname">
-              <el-input placeholder="请输入生效日期" v-model="screenForm.startDate"></el-input>
+            <el-form-item label="生效日期" prop="startDate">
+              <el-date-picker
+                v-model="screenForm.startDate"
+                type="datetime"
+                placeholder="请输入生效日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="失效日期" prop="nickname">
-              <el-input placeholder="请输入失效日期" v-model="screenForm.endDate"></el-input>
+            <el-form-item label="失效日期" prop="endDate">
+              <el-date-picker
+                v-model="screenForm.endDate"
+                type="datetime"
+                placeholder="请输入生效日期"
+                value-format="yyyy-MM-dd HH:mm:ss "
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="销售类型" prop="nickname">
-              <el-input placeholder="请输入销售类型" v-model="screenForm.saleTypeId"></el-input>
+            <el-form-item label="销售类型" prop="saleTypeId">
+              <el-input
+                placeholder="请输入销售类型"
+                v-model="screenForm.saleTypeId"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品品类" prop="nickname">
-              <el-select placeholder="请选择产品品类">
-                <el-option label="品类一" value="shanghai"></el-option>
-                <el-option label="品类二" value="beijing"></el-option>
+            <el-form-item label="产品品类" prop="categoryId">
+              <el-select
+                placeholder="请选择产品品类"
+                v-model="screenForm.categoryId"
+              >
+                <el-option
+                  v-for="item in dictList"
+                  :label="item.dictValue"
+                  :value="item.sysDictId"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="规格型号" prop="nickname">
-              <el-input placeholder="请输入规格型号" v-model="screenForm.specification"></el-input>
+            <el-form-item label="规格型号" prop="specification">
+              <el-input
+                placeholder="请输入规格型号"
+                v-model="screenForm.specification"
+              ></el-input>
             </el-form-item>
           </el-col>
 
@@ -104,13 +131,7 @@
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column
-            align="center"
-            label="存货代码"
-            prop="categoryNumber"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
+
           <el-table-column
             align="center"
             label="规格型号"
@@ -164,14 +185,14 @@
           <el-table-column
             align="center"
             label="是否促销价"
-            prop="promotion"
+            prop="isPromote"
             min-width="160"
             show-overflow-tooltip
           >
-               <template slot-scope="scope">
-               <el-tag type="success" v-if="scope.row.promotion">是</el-tag>
-                 <el-tag type="danger" v-else>否</el-tag>
-              </template>
+            <template slot-scope="scope">
+              <el-tag type="success" v-if="scope.row.isPromote">是</el-tag>
+              <el-tag type="danger" v-else>否</el-tag>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
@@ -180,10 +201,10 @@
             min-width="160"
             show-overflow-tooltip
           >
-               <template slot-scope="scope">
-               <el-tag type="success" v-if="scope.row.isRevoke">是</el-tag>
-                 <el-tag type="danger" v-else>否</el-tag>
-              </template>
+            <template slot-scope="scope">
+              <el-tag type="success" v-if="scope.row.isRevoke">是</el-tag>
+              <el-tag type="danger" v-else>否</el-tag>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
@@ -204,9 +225,8 @@
       <!-- 分页 -->
       <div class="fr">
         <el-pagination
-         @size-change="handleSizeChange"
+          @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-
           :current-page="currentPage"
           :page-sizes="[10, 20, 30, 50]"
           :page-size="10"
@@ -221,10 +241,9 @@
 
 <script>
 import Mixin from "@/mixin/index";
-import {
-getProductPriceList
-} from "@/api/basic_data/material";
-import { downloadFiles } from "@/utils/util";
+import { getProductPriceList } from "@/api/basic_data/material";
+import { getDictList } from "@/api/common";
+import { downloadFiles, parseTime } from "@/utils/util";
 export default {
   mixins: [Mixin],
   data() {
@@ -246,7 +265,7 @@ export default {
           rebateRatio: "",
           effectiveDate: "",
           ExpiryDate: "",
-          promotion: "",
+          isPromote: "",
           cancellation: "",
           wholesaleOne: "3,299.00",
           remarks: "*常规机*",
@@ -303,35 +322,39 @@ export default {
           remarks: "*常规机*",
         },
       ],
-       searchForm: {
-        categoryId:"",
-       endDate:"",
-       materialName:"",
-       materialNumber:"",
-       saleTypeId:"",
-       specification:"",
-       startDate:""
-
+      screenForm: {
+        categoryId: "",
+        endDate: "",
+        materialName: "",
+        materialNumber: "",
+        saleTypeId: "",
+        specification: "",
+        startDate: "",
       },
+      dictList: {},
     };
   },
+  mounted() {
+    getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
+      this.dictList = res.data;
+    });
+  },
   methods: {
     addFn() {
       this.showDialogForm = true;
     },
-      getList() {
+    getList() {
       this.listLoading = true;
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        categoryId:this.searchForm.categoryId,
-       endDate:this.searchForm.endDate,
-       materialName:this.searchForm.materialName,
-       materialNumber:this.searchForm.materialNumber,
-       saleTypeId:this.searchForm.saleTypeId,
-       specification:this.searchForm.specification,
-       startDate:this.searchForm.startDate
-
+        categoryId: this.screenForm.categoryId,
+        endDate: this.screenForm.endDate,
+        materialName: this.screenForm.materialName,
+        materialNumber: this.screenForm.materialNumber,
+        saleTypeId: this.screenForm.saleTypeId,
+        specification: this.screenForm.specification,
+        startDate: this.screenForm.startDate,
       };
       getProductPriceList(params).then((res) => {
         this.dataList = res.data.records;

src/views/basic_data/material/relation_list.vue

@@ -12,10 +12,13 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="name">
-              <el-input
-                placeholder="请输入产品名称"
-                v-model="screenForm.name"
-              ></el-input>
+              <el-select placeholder="请选择产品品类" v-model="screenForm.name">
+                <el-option
+                  v-for="item in materialLis"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -108,7 +111,7 @@
         <el-button
           type="primary"
           size="small"
-          @click="(showDialogForm = true), (type = 1)"
+          @click="(showDialogForm = true), (type = 1), hanleMachine()"
           >新增</el-button
         >
 
@@ -297,86 +300,64 @@
     >
       <el-form ref="form" :model="diaLogForm" label-width="100px">
         <el-form-item label="产品名称">
-          <!-- <el-select
-            v-model="diaLogForm.positionName"
-            multiple
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select> -->
-          <el-input v-model="diaLogForm.storeName"></el-input>
+         <el-select placeholder="请选择产品品类" v-model="diaLogForm.materialId">
+                <el-option
+                  v-for="item in materialLis"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+
         </el-form-item>
         <el-form-item label="产品型号">
           <el-input v-model="diaLogForm.productModel"></el-input>
         </el-form-item>
         <el-form-item label="套机棉麻">
-          <!-- <el-input v-model="diaLogForm.alert"></el-input> -->
+          <el-input v-model="diaLogForm.composeNumber"></el-input>
         </el-form-item>
         <el-form-item label="产品体积">
           <el-input v-model="diaLogForm.productVolume"></el-input>
         </el-form-item>
         <el-form-item label="内机编码">
-          <el-select
-            v-model="diaLogForm.positionName"
-            multiple
-            placeholder="请选择"
-          >
+          <el-select v-model="diaLogForm.items" multiple placeholder="请选择">
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in machineList"
+              :key="item.id"
+              :label="item.innerMachineNumber"
+              :value="item.id"
             >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="外机编码">
-          <el-select
-            v-model="diaLogForm.positionName"
-            multiple
-            placeholder="请选择"
-          >
+          <el-select v-model="diaLogForm.items" multiple placeholder="请选择">
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in machineList"
+              :key="item.id"
+              :label="item.outsideMachineNumber"
+              :value="item.id"
             >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="配件1">
-          <el-select
-            v-model="diaLogForm.positionName"
-            multiple
-            placeholder="请选择"
-          >
+          <el-select v-model="diaLogForm.items" multiple placeholder="请选择">
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in machineList"
+              :key="item.id"
+              :label="item.parts1"
+              :value="item.id"
             >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="配件2">
-          <el-select
-            v-model="diaLogForm.positionName"
-            multiple
-            placeholder="请选择"
-          >
+          <el-select v-model="diaLogForm.items" multiple placeholder="请选择">
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in machineList"
+              :key="item.id"
+              :label="item.parts2"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -393,13 +374,15 @@
 <script>
 import Mixin from "@/mixin/index";
 import { downloadFiles, handleImport } from "@/utils/util";
-
+// import { getDictList } from "@/api/common";
 import {
   getProductList,
   getProductEdit,
   getProductDetail,
   getProductDel,
   getProductAdd,
+  getMachineLlist,
+getMaterialList
 } from "@/api/basic_data/material";
 export default {
   mixins: [Mixin],
@@ -431,16 +414,13 @@ export default {
         },
       ],
       diaLogForm: {
+        adminCompanyId: null,
+        composeNumber: "",
         id: null,
-        composeNumber: "5464",
-        items: [
-          { id: "1", innerOutsideMachineId: "dfsf", parentId: "dsfs" },
-          { id: "2", innerOutsideMachineId: "dfsf", parentId: "sdfdsf" },
-        ],
-        materialId: "454",
-        orgNumber: 454,
-        productModel: "5454545",
-        productVolume: 2,
+        items: [],
+        materialId: null,
+        productModel: "",
+        productVolume: 0,
       },
       showDialogForm: false,
       dataList: [
@@ -501,7 +481,7 @@ export default {
           updateDate: "2022-09-12",
         },
       ],
-      searchForm: {
+      screenForm: {
         innerName: "",
         innerNumber: "",
         innerType: "",
@@ -514,24 +494,45 @@ export default {
         volume: "",
       },
       type: null,
+      machineList: [],
+      machinePei: {
+        currentPage: 1,
+        pageSize: 10,
+        name: "",
+        number: "",
+        type: "",
+        volume: "",
+      },
+      materialLis: {},
     };
   },
+  mounted() {
+      let params = {
+        pageNum:1,
+        pageSize: 410,
+        keyword: '',
+      };
+      getMaterialList(params).then((res) => {
+        this.materialLis = res.data.records;
+          console.log(this.materialLis,44444);
+      });
+  },
   methods: {
     getList() {
       this.listLoading = true;
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        innerName: this.searchForm.innerName,
-        innerNumber: this.searchForm.innerNumber,
-        innerType: this.searchForm.innerType,
-        name: this.searchForm.name,
-        number: this.searchForm.number,
-        outsideName: this.searchForm.outsideName,
-        outsideNumber: this.searchForm.outsideNumber,
-        outsideType: this.searchForm.outsideType,
-        type: this.searchForm.type,
-        volume: this.searchForm.volume,
+        innerName: this.screenForm.innerName,
+        innerNumber: this.screenForm.innerNumber,
+        innerType: this.screenForm.innerType,
+        name: this.screenForm.name,
+        number: this.screenForm.number,
+        outsideName: this.screenForm.outsideName,
+        outsideNumber: this.screenForm.outsideNumber,
+        outsideType: this.screenForm.outsideType,
+        type: this.screenForm.type,
+        volume: this.screenForm.volume,
       };
       getProductList(params).then((res) => {
         this.dataList = res.data.records;
@@ -540,57 +541,34 @@ export default {
       });
     },
     editFn(id, row) {
+      this.hanleMachine();
       this.type = 2;
       this.diaLogForm = {
+        ...this.diaLogForm,
         id,
-        composeNumber: row.composeNumber,
-        items:
-          row.items === undefined
-            ? [
-                { id: "1", innerOutsideMachineId: "df", parentId: "dsf" },
-                { id: "2", innerOutsideMachineId: "ew", parentId: "wew" },
-              ]
-            : row.items,
+        adminCompanyId: row.adminCompanyId,
         materialId: row.materialId,
-        orgNumber: row.orgNumber,
-        productModel: row.productModel,
-        productVolume: row.productVolume,
-        positionName: row.positionName,
       };
 
       this.showDialogForm = true;
     },
     hanleInfo() {
       if (this.type === 1) {
+        this.diaLogForm.id = null;
+        this.diaLogForm.adminCompanyId = null;
 
-        // {
-
-        // }
-        getProductAdd(this.diaLogForm).then((res) => {
+        const items = this.hanleForItem(this.diaLogForm.items);
+        getProductAdd({ ...this.diaLogForm, items }).then((res) => {
           this.$successMsg("保存成功");
           this.getList();
         });
       } else if (this.type === 2) {
-        const params = {
-          composeNumber: this.diaLogForm.composeNumber,
-          id: this.diaLogForm.id,
-          items: [
-            {
-              id: "445",
-              innerOutsideMachineId: "4545",
-              parentId: "4554",
-            },
-          ],
-          materialId: this.diaLogForm.materialId,
-          orgNumber: this.diaLogForm.orgNumber,
-          productModel: this.diaLogForm.productModel,
-          productVolume: this.diaLogForm.productVolume,
-        };
+        const items = this.hanleForItem(this.diaLogForm.items);
+        const params = { ...this.diaLogForm, items };
         getProductEdit(params).then((res) => {
           this.$successMsg("编辑成功");
           this.getList();
         });
-        this.diaLogForm.id = null;
       }
 
       this.showDialogForm = false;
@@ -623,6 +601,40 @@ export default {
         productVolume: "",
       };
     },
+    hanleMachine() {
+      let params2 = {
+        pageNum: this.machinePei.currentPage,
+        pageSize: this.machinePei.pageSize,
+        name: this.machinePei.name,
+        number: this.machinePei.number,
+        type: this.machinePei.type,
+        volume: this.machinePei.volume,
+      };
+      getMachineLlist(params2).then((res) => {
+        this.machineList = res.data.records;
+        console.log(this.machineList, 1233);
+      });
+          let params = {
+        pageNum:1,
+        pageSize: 410,
+        keyword: '',
+      };
+      getMaterialList(params).then((res) => {
+        this.materialLis = res.data.records;
+          console.log(this.materialLis,44444);
+      });
+    },
+    hanleForItem(item) {
+      const items = [];
+      item.map((k) => {
+        return items.push({
+          id: "",
+          innerOutsideMachineId: k,
+          parentId: "",
+        });
+      });
+      return items;
+    },
   },
 };
 </script>

src/views/basic_data/supplier/supplier_list.vue

@@ -45,11 +45,6 @@
             stripe
           >
             <el-table-column
-              type="selection"
-              align="center"
-              min-width="100"
-            ></el-table-column>
-            <el-table-column
               align="center"
               label="编码"
               prop="number"
@@ -60,7 +55,7 @@
             <el-table-column
               align="center"
               label="使用组织"
-              prop="useOrgId"
+              prop="useOrgName"
               min-width="100"
             ></el-table-column>
             <el-table-column

src/views/basic_data/taker/taker_car.vue

@@ -44,7 +44,7 @@
         <el-button type="primary" size="small" @click="addDataList"
           >新增</el-button
         >
-        <el-button type="primary" size="small">编辑</el-button>
+
         <el-popconfirm @onConfirm="delFn" title="这是一段内容确定删除吗？">
           <el-button
             size="small"
@@ -56,7 +56,6 @@
         </el-popconfirm>
       </div>
       <div class="fr">
-        <el-button type="primary" size="small">导入</el-button>
         <el-button type="primary" size="small" @click="exportFn"
           >导出</el-button
         >
@@ -98,28 +97,28 @@
           <el-table-column
             align="center"
             label="创建者"
-            prop="createUser"
+            prop="createBy"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="创建时间"
-            prop="createDate"
+            prop="createTime"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="更新者"
-            prop="updateUser"
+            prop="updateBy"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="更新时间"
-            prop="updateDate"
+            prop="updateTime"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -171,9 +170,18 @@
       :show-close="false"
       :close-on-click-modal="false"
     >
-      <el-form ref="form" :model="addForm" label-width="120px">
-        <el-form-item label="经销商名称">
-          <el-select v-model="addForm.customerId" placeholder="名称">
+      <el-form
+        ref="addForm"
+        :rules="rules"
+        :model="addForm"
+        label-width="120px"
+        class="demo-ruleForm"
+      >
+        <el-form-item label="经销商名称" prop="customerId">
+          <el-select
+            v-model="addForm.customerId"
+            placeholder="请选择经销商名称"
+          >
             <el-option
               v-for="item in dealerList"
               :key="item.id"
@@ -185,23 +193,26 @@
         </el-form-item>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="车牌号">
+            <el-form-item label="车牌号" prop="carBrand">
               <el-input v-model="addForm.carBrand"></el-input> </el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="联系电话">
+            <el-form-item label="联系电话" prop="mobile">
               <el-input v-model="addForm.mobile"></el-input> </el-form-item
           ></el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="车型">
+            <el-form-item label="车型" prop="carType">
               <el-input v-model="addForm.carType"></el-input> </el-form-item
           ></el-col>
           <el-col :span="12">
-            <el-form-item label="体积">
-              <el-input v-model="addForm.volume"></el-input> </el-form-item
-          ></el-col>
+            <el-form-item label="体积" prop="volume">
+              <el-input v-model="addForm.volume">
+                <i class="el-input__icon" slot="suffix">m³ </i>
+              </el-input>
+            </el-form-item></el-col
+          >
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -236,6 +247,30 @@ export default {
         volume: "",
         carBrand: "",
       },
+      rules: {
+        customerId: [
+          { required: true, message: "请选择活动区域", trigger: "change" },
+        ],
+        mobile: [
+          {
+            required: true,
+            message: "请输入联系电话",
+            trigger: "blur",
+          },
+          {
+            required: true,
+            pattern:
+              /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/,
+            message: "联系电话格式不正确",
+            trigger: "blur",
+          },
+        ],
+        // carType: [{ required: true, message: "车型不能为空", trigger: "blur" }],
+        // volume: [{ required: true, message: "体积不能为空", trigger: "blur" }],
+        carBrand: [
+          { required: true, message: "车牌号不能为空", trigger: "blur" },
+        ],
+      },
       dialogForm: false,
       dataList: [],
       searchForm: {
@@ -247,8 +282,7 @@ export default {
     };
   },
   async created() {
-    await this.getDataList({ pageNum: 1, pageSize: 10 });
-    await this.getDealerDataList({ pageNum: 1, pageSize: 10 });
+    this.getDataList({ pageNum: 1, pageSize: 10 });
   },
   methods: {
     // 筛选部分数据或者单个
@@ -269,14 +303,8 @@ export default {
       downloadFiles("/take-car-record/export", screenData);
     },
     //取消
-    cancelFn() {
-      this.addForm = {
-        customerId: "",
-        mobile: "",
-        carType: "",
-        volume: "",
-        carBrand: "",
-      };
+    async cancelFn() {
+      await this.$refs.addForm.resetFields();
       this.dialogForm = false;
     },
     //编辑
@@ -315,8 +343,11 @@ export default {
     //新增
     addDataList() {
       this.dialogForm = true;
+      this.getDealerDataList({ pageNum: 1, pageSize: 10 });
     },
     async addDataListFn() {
+      await this.$refs.addForm.validate();
+
       const res = this.dealerList.filter(
         (v) => v.id === this.addForm.customerId
       )[0];
@@ -338,6 +369,7 @@ export default {
       //   volume: "",
       //   carBrand: "",
       // };
+      await this.$refs.addForm.resetFields();
       this.getDataList({ pageNum: this.currentPage, pageSize: this.pageSize });
       this.dialogForm = false;
     },

src/views/basic_data/taker/taker_list.vue

@@ -52,7 +52,6 @@
         <el-button type="primary" size="small" @click="addFn">新增</el-button>
       </div>
       <div class="fr">
-        <el-button type="primary" size="small">导入</el-button>
         <el-button type="primary" size="small" @click="exportFn"
           >导出</el-button
         >
@@ -72,11 +71,6 @@
           stripe
         >
           <el-table-column
-            type="selection"
-            align="center"
-            min-width="100"
-          ></el-table-column>
-          <el-table-column
             align="center"
             label="经销商名称"
             prop="customerName"
@@ -128,14 +122,14 @@
           <el-table-column
             align="center"
             label="创建人"
-            prop="createUser"
+            prop="createBy"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="创建时间"
-            prop="createDate"
+            prop="createTime"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -195,7 +189,12 @@
       :show-close="false"
       :close-on-click-modal="false"
     >
-      <el-form ref="addForm" :model="addForm" label-width="120px">
+      <el-form
+        ref="addForm"
+        :rules="rules"
+        :model="addForm"
+        label-width="120px"
+      >
         <el-form-item label="经销商名称" prop="customerId">
           <el-select v-model="addForm.customerId" placeholder="名称">
             <el-option
@@ -255,13 +254,13 @@
           >
         </el-row>
         <!-- <el-form-item label="上传提货人附件">
-          <el-upload class="upload-demo">
+          <el-upload action="#" class="upload-demo" :on-success="handlefile">
             <el-button size="small" type="info">点击上传</el-button>
           </el-upload>
         </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogForm = false">取 消</el-button>
+        <el-button @click="cancelFn">取 消</el-button>
         <el-button type="primary" @click="addDataFn">确 定</el-button>
       </div>
     </el-dialog>
@@ -289,11 +288,61 @@ export default {
         takerName: "",
         identity: "",
         phone: "",
-        sparePhone: "",
+
         sparePhone: "",
         expireTime: "",
         code: "",
       },
+      rules: {
+        customerId: [
+          { required: true, message: "请选择经销商", trigger: "change" },
+        ],
+        takerName: [
+          { required: true, message: "请输入提货人姓名", trigger: "blur" },
+        ],
+        identity: [
+          {
+            required: true,
+
+            message: "请输入身份证号码",
+            trigger: "blur",
+          },
+          {
+            pattern:
+              /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+            message: "身份证号格式不正确",
+            trigger: "blur",
+          },
+        ],
+        phone: [
+          {
+            required: true,
+            message: "请输入联系电话",
+            trigger: "blur",
+          },
+          {
+            required: true,
+            pattern:
+              /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/,
+            message: "联系电话格式不正确",
+            trigger: "blur",
+          },
+        ],
+        sparePhone: [
+          {
+            required: true,
+            pattern:
+              /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/,
+            message: "请输入备用电话",
+            trigger: "blur",
+          },
+        ],
+        expireTime: [
+          { required: true, message: "有效期不能为空", trigger: "blur" },
+        ],
+        code: [{ required: true, message: "验证码不能为空", trigger: "blur" }],
+      },
+
       dialogForm: false,
       dataList: [],
       searchForm: {
@@ -312,6 +361,15 @@ export default {
     changFn(v) {
       console.log(v);
     },
+    //取消
+    cancelFn() {
+      this.$refs.addForm.resetFields();
+      this.dialogForm = false;
+    },
+    //上传
+    handlefile(response, file, fileList) {
+      console.log(response, file, fileList);
+    },
     //导出
     exportFn() {
       let screenData = {
@@ -367,7 +425,8 @@ export default {
     },
     //新增
     async addDataFn() {
-      console.log(this.addForm);
+      await this.$refs.addForm.validate();
+
       const res = this.dealerList.filter(
         (v) => v.id === this.addForm.customerId
       )[0];