物料

src/api/basic_data/material.js

@@ -315,3 +315,12 @@ export function getUserList(params) {
     params
   })
 }
+
+
+export function getPriceSubmit(params) {
+  return request({
+    url:'/product-upd-price/submit',
+    method: 'POST',
+    params
+  })
+}

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

@@ -21,47 +21,47 @@
               ></el-input>
             </el-form-item>
           </el-col>
-<!--          <el-col :xs="24" :sm="12" :lg="6">-->
-<!--            <el-form-item label="调价业务员">-->
-<!--              <el-select-->
-<!--                placeholder="请选择调价业务员"-->
-<!--                filterable-->
-<!--                @change="handleUser"-->
-<!--                v-model="serviceId"-->
-<!--              >-->
-<!--                <el-option-->
-<!--                  v-for="(item, index) in userList"-->
-<!--                  :label="item.nickName"-->
-<!--                  :value="item.roleId"-->
-<!--                  :key="index"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :xs="24" :sm="12" :lg="6">-->
-<!--            <el-form-item label="调价部门">-->
-<!--              <el-input-->
-<!--                placeholder="调价部门"-->
-<!--                disabled-->
-<!--                v-model="adminCompanyName"-->
-<!--              ></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :xs="24" :sm="12" :lg="6">-->
-<!--            <el-form-item label="销售类型">-->
-<!--              <el-select-->
-<!--                placeholder="请选择销售类型"-->
-<!--                filterable-->
-<!--                v-model="saleTypeId"-->
-<!--              >-->
-<!--                <el-option-->
-<!--                  v-for="item in typeList"-->
-<!--                  :label="item.saleName"-->
-<!--                  :value="item.id"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!-- <el-col :xs="24" :sm="12" :lg="6">
+                     <el-form-item label="调价业务员">
+                       <el-select
+                         placeholder="请选择调价业务员"
+                         filterable
+                         @change="handleUser"
+                         v-model="serviceId"
+                       >
+                         <el-option
+                           v-for="(item, index) in userList"
+                           :label="item.nickName"
+                           :value="item.roleId"
+                           :key="index"
+                         ></el-option>
+                       </el-select>
+                     </el-form-item>
+                   </el-col>
+                   <el-col :xs="24" :sm="12" :lg="6">
+                     <el-form-item label="调价部门">
+                       <el-input
+                         placeholder="调价部门"
+                         disabled
+                         v-model="adminCompanyName"
+                       ></el-input>
+                     </el-form-item>
+                   </el-col> -->
+          <!-- <el-col :xs="24" :sm="12" :lg="6">
+                     <el-form-item label="销售类型">
+                       <el-select
+                         placeholder="请选择销售类型"
+                         filterable
+                         v-model="saleTypeId"
+                       >
+                         <el-option
+                           v-for="item in typeList"
+                           :label="item.saleName"
+                           :value="item.id"
+                         ></el-option>
+                       </el-select>
+                     </el-form-item>
+                   </el-col> -->
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="文件编码">
               <el-input placeholder="请输入" v-model="base.remark"></el-input>
@@ -131,13 +131,15 @@
               align="center"
               label="存货编码"
               prop="materialNumber"
-
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input disabled v-model="scope.row.materialNumber"></el-input>
+                  <el-input
+                    disabled
+                    v-model="scope.row.materialNumber"
+                  ></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -150,7 +152,10 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input disabled v-model="scope.row.materialName"></el-input>
+                  <el-input
+                    disabled
+                    v-model="scope.row.materialName"
+                  ></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -163,20 +168,23 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input disabled v-model="scope.row.specification"></el-input>
+                  <el-input
+                    disabled
+                    v-model="scope.row.specification"
+                  ></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
             <el-table-column
               align="center"
               label="计量单位"
-              prop="company"
+              prop="unit"
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.SalesType"></el-input>
+                  <el-input v-model="scope.row.unit"></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -214,9 +222,10 @@
               ><template slot-scope="scope">
                 <el-form-item>
                   <el-select
+                    multiple
                     v-model="scope.row.walletRebateId"
                     placeholder="请选择返利类型"
-                    @change="handelRebateList($event, scope.$index)"
+                    @change="handelRebateList($event, scope.$index, scope.row)"
                   >
                     <el-option
                       v-for="(item, index) in rebateList"
@@ -309,8 +318,9 @@
               ><template slot-scope="scope">
                 <el-form-item>
                   <el-select
+                    multiple
                     v-model="scope.row.walletsId"
-                    @change="handelWallets($event, scope.$index)"
+                    @change="handelWallets($event, scope.$index, scope.row)"
                     placeholder="请选择现金钱包"
                   >
                     <el-option
@@ -440,7 +450,7 @@
             <el-table-column
               align="center"
               label="计量单位"
-              prop="company"
+              prop="unit"
               min-width="160"
               show-overflow-tooltip
             >
@@ -699,8 +709,8 @@
             @select-all="handleSelectionAllChange"
             @selection-change="handleSelectionChange"
           >
-            <el-table-column type="selection" width="55"> </el-table-column>
-
+            <el-table-column align="center" type="selection" width="55">
+            </el-table-column>
             <el-table-column
               align="center"
               label="使用组织"
@@ -885,24 +895,73 @@ export default {
     });
   },
   methods: {
-    handelWallets(e, index) {
-      let obj =  {
-         	"billId": "",
-					"id": "",
-					"parentId": "",
-					"parentItemId": "",
-					"walletRebateId": e
+    // xua
+    handelWallets(e, index, row) {
+      for (let i = 0; i < e.length; i++) {
+        if (this.items[index].wallets.length) {
+          console.log(1212);
+          for (let j = 0; j < this.items[index].wallets.length; j++) {
+            if (e[i] !== this.items[index].wallets[j].walletId) {
+              this.$set(this.items[index], "wallets", [
+                ...this.items[index].wallets,
+                {
+                  type: "COMMONLY",
+                  id: "",
+                  updPriceBillId: row.id,
+                  updPriceBillItemId: row.id,
+                  walletId: e[i],
+                },
+              ]);
+            }
+          }
+        } else {
+          console.log(987);
+          this.$set(this.items[index], "wallets", [
+            {
+              type: "COMMONLY",
+              id: "",
+              updPriceBillId: row.id,
+              updPriceBillItemId: row.id,
+              walletId: e[0],
+            },
+          ]);
         }
+      }
 
-      this.$set(this.items[index], "wallets", [...this.items[index].wallets,obj]);
+      console.log(this.items[index], 456);
     },
-    handelRebateList(e, index) {
-      const reabteData = this.rebateList.filter((k) => {
-        return k.walletRebateId == e;
-      })[0];
-      this.$set(this.items[index], "walletRebateName", reabteData.name);
-      this.$set(this.items[index], "walletRebateId", reabteData.walletRebateId);
-      this.$set(this.items[index], "rebateRate", reabteData.rebateRate);
+    handelRebateList(e, index, row) {
+      for (let i = 0; i < e.length; i++) {
+        if (this.items[index].wallets.length) {
+          console.log(1212);
+          for (let j = 0; j < this.items[index].wallets.length; j++) {
+            if (e[i] !== this.items[index].wallets[j].walletId) {
+              this.$set(this.items[index], "wallets", [
+                ...this.items[index].wallets,
+                {
+                  type: "REBATE",
+                  id: "",
+                  updPriceBillId: row.id,
+                  updPriceBillItemId: row.id,
+                  walletId: e[i],
+                },
+              ]);
+            }
+          }
+        } else {
+          console.log(987);
+
+          this.$set(this.items[index], "rebateWallets", [
+            {
+              type: "REBATE",
+              id: "",
+              updPriceBillId: row.id,
+              updPriceBillItemId: row.id,
+              walletId: e[0],
+            },
+          ]);
+        }
+      }
     },
     handleUser(e) {
       const adminCompany = this.userList.filter((k) => {
@@ -910,7 +969,7 @@ export default {
       })[0];
       this.adminWebsitId = adminCompany.adminUserId;
       this.adminCompanyName = adminCompany.adminCompanyName;
-      this.serviceName = adminCompany.nickName || 'd';
+      this.serviceName = adminCompany.nickName || "d";
       this.serviceId = adminCompany.roleId;
     },
     goBack() {
@@ -930,6 +989,7 @@ export default {
           this.items.push({
             baseUnitId: "",
             batchPrice: "",
+            unit: "",
             billId: "",
             endDate: "",
             isPromote: "",
@@ -941,41 +1001,41 @@ export default {
             materialOldNumber: this.selectData[i].oldNumber,
             parentId: "",
             walletRebateName: "",
-            walletRebateId: "",
+            walletRebateId: [],
             rebateRate: "",
             qty: "",
             rebateUseRate: "",
-            retailPrice: ""||0,
+            retailPrice: "" || 0,
             saleTypeId: "",
             specification: this.selectData[i].specification,
             startDate: this.selectData[i].startDate,
-            wallets: [
-
-            ],
+            wallets: [],
+            rebateWallets: [],
             rebateList: [...this.rebateList],
             isPublishArr: [
               {
                 value: "是",
-                bool: 1,
+                bool: true,
               },
               {
                 value: "否",
-                bool: 0,
+                bool: false,
               },
             ],
             isPromoteArr: [
               {
                 value: "是",
-                bool: 1,
+                bool: true,
               },
               {
                 value: "否",
-                bool: 0,
+                bool: false,
               },
             ],
+            id: this.selectData[i].id,
           });
         }
-        // console.log(this.items);
+        this.selectData = [];
         this.centerDialogVisible = false;
       } else {
         this.$errorMsg("请选择内容");
@@ -1019,19 +1079,18 @@ export default {
     },
     hanleSbumit() {
       for (let i = 0; i < this.items.length; i++) {
-
-          for (let j = i+1; j < this.items.length; j++) {
-
-              if (this.items[i].materialNumber==this.items[j].materialNumber) {
-                if (this.items[i].saleTypeId ==this.items[j].saleTypeId ) {
-                      this.$errorMsg('有存货编码销售类型相同')
-                return
-                }
-
-              }
-
-
+        this.items[i].wallets = [
+          ...this.items[i].rebateWallets,
+          ...this.items[i].wallets,
+        ];
+        for (let j = i + 1; j < this.items.length; j++) {
+          if (this.items[i].materialNumber == this.items[j].materialNumber) {
+            if (this.items[i].saleTypeId == this.items[j].saleTypeId) {
+              this.$errorMsg("有存货编码销售类型相同");
+              return;
+            }
           }
+        }
       }
       const params = {
         ...this.base,
@@ -1039,67 +1098,14 @@ export default {
         saleTypeId: this.saleTypeId,
         adminWebsitId: this.adminWebsitId,
         serviceId: this.serviceId,
-      adminCompanyName :this.adminCompanyName,
-      serviceName :this.nickName ,
-
-      }
+        adminCompanyName: this.adminCompanyName,
+        serviceName: this.nickName,
+      };
       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: "",
-        //   adminWebsitId: "",
-        //   billId: "",
-        //   examineNote: "",
-        //   examineResult: true,
-        //   examineStatus: "",
-        //   id: null,
-        //   serviceId: "",
-        //   serviceName: "",
-        //   remark: "",
-        //   saleTypeId: "",
-        // };
         this.$successMsg("成功");
         getProductRriceDetail({ id: res.data }).then((res) => {
           this.base.billId = res.data.billId;
+          this.$parent.show = 1
         });
       });
     },

src/views/basic_data/material/modify_list.vue

@@ -115,14 +115,14 @@
             <el-table-column
               align="center"
               label="调价日期"
-              prop="modifyPriceDate"
+              prop="createBy"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="销售类型"
-              prop="saleTypeId"
+              prop="saleTypeName"
               :formatter="formatterType"
               min-width="160"
               show-overflow-tooltip
@@ -288,12 +288,20 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
+                <template v-if="scope.row.examineStatus=='SAVE'">
+                     <el-popconfirm title="这是一段内容确定删除吗？" @onConfirm="handleGetPriceSubmit(scope.row.id)" style="margin-right:10px">
+                  <el-button type="text" slot="reference">提审</el-button>
+                </el-popconfirm>
+                </template>
+
+              <template  v-if="scope.row.examineStatus=='WAIT'">
                 <el-button
                   type="text"
                   class="textColor"
                   @click="approvalFn(scope.row.updPriceBillId)"
                   >审批</el-button
                 >
+              </template>
                 <el-button
                   type="text"
                   class="textColor"
@@ -335,6 +343,7 @@ import {
   getProductRriceList,
   getProductRricedel,
   getTypeList,
+  getPriceSubmit
 } from "@/api/basic_data/material";
 import { downloadFiles } from "@/utils/util";
 export default {
@@ -433,6 +442,11 @@ export default {
         });
       });
     },
+    handleGetPriceSubmit(id){
+      getPriceSubmit({id}).then(res=>{
+        this.$successMsg('已提审')
+      })
+    },
     approvalFn(id) {
       getProductRriceDetail({ id }).then((res) => {
         this.detail = res.data;

src/views/sales_policy/components/AddCondition.vue

@@ -1,7 +1,11 @@
 <template>
   <el-container>
     <el-header height="50px" class="header">
-      <el-page-header @back="handleBack" :content="!id? '添加页面':'详情页面'"> </el-page-header>
+      <el-page-header
+        @back="handleBack"
+        :content="!id ? '添加页面' : '详情页面'"
+      >
+      </el-page-header>
     </el-header>
     <div class="line">
       <el-divider></el-divider>
@@ -106,9 +110,20 @@
             <el-row>
               <el-row>
                 <el-table style="width: 100%" :data="item" border>
-                  <el-table-column type="selection" width="55" align="center" v-if="!id">
+                  <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
+                    type="index"
+                    label="序号"
+                    width="55"
+                    align="center"
+                    v-else
+                  >
                   </el-table-column>
                   <el-table-column
                     label="货品名称"
@@ -116,7 +131,9 @@
                     align="center"
                     prop="materialName"
                   >
-                    <template slot-scope="scope">{{ scope.row.materialName }}</template>
+                    <template slot-scope="scope">{{
+                      scope.row.materialName
+                    }}</template>
                   </el-table-column>
                   <el-table-column
                     prop="specification"
@@ -136,7 +153,11 @@
             </el-row>
             <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="限定机型">
-                <el-input size="small" v-model="limit" :readonly="!id?false:true"></el-input>
+                <el-input
+                  size="small"
+                  v-model="limit"
+                  :readonly="!id ? false : true"
+                ></el-input>
               </el-form-item>
             </el-col>
 
@@ -149,7 +170,7 @@
               <el-form-item :label="'配提' + (index + 1) + '比例'">
                 <el-input
                   size="small"
-                  :readonly="!id?false:true"
+                  :readonly="!id ? false : true"
                   v-model="popArr['line_' + index]"
                 ></el-input>
               </el-form-item>
@@ -170,13 +191,14 @@
           <el-button type="primary" size="small" @click="handleSubmit"
             >保存</el-button
           >
-
         </el-col>
         <el-col :xs="24" :sm="12" :lg="12" :offset="0" class="tr">
           <el-button type="primary" size="small" @click="hanleAddModel"
             >添加</el-button
           >
-            <el-button type="primary" size="small" @click="handleresale">重置</el-button>
+          <el-button type="primary" size="small" @click="handleresale"
+            >重置</el-button
+          >
         </el-col>
       </el-row>
     </el-footer>
@@ -385,10 +407,10 @@ export default {
       type: String,
       default: "",
     },
-    policyId:{
-      type:String,
-      default:""
-    }
+    policyId: {
+      type: String,
+      default: "",
+    },
   },
   data() {
     return {
@@ -449,36 +471,32 @@ export default {
     },
     getCommonApi() {
       if (this.id) {
-
         getConditionMaterialDetail({ id: this.policyId }).then((res) => {
-          this.pop = res.data.pop
+          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];
-                   continue
-               }
-
-
-              this.$set(this.popArr,`line_${i-1}`,pop[i])
+          let pop = res.data.pop.split(":");
+          for (let i = 0; i < pop.length; i++) {
+            if (i == 0) {
+              this.limit = pop[i];
+              continue;
             }
-            console.log(this.popArr);
-
-              for (let k = 0; k <pop.length ; k++) {
-               getConditionMaterialList({
-                pageNum: 1,
-                pageSize: -1,
-                policyConditionId:res.data.id,
-                popType: k+1,
-                  }).then((res) => {
 
-                this.conditionBoxs.push(res.data.records);
-                  });
-              }
-                  console.log(this.conditionBoxs);
+            this.$set(this.popArr, `line_${i - 1}`, pop[i]);
+          }
+          console.log(this.popArr);
 
-        })
+          for (let k = 0; k < pop.length; k++) {
+            getConditionMaterialList({
+              pageNum: 1,
+              pageSize: -1,
+              policyConditionId: res.data.id,
+              popType: k + 1,
+            }).then((res) => {
+              this.conditionBoxs.push(res.data.records);
+            });
+          }
+          console.log(this.conditionBoxs);
+        });
       }
     },
     toggleSelection(rows) {
@@ -583,7 +601,6 @@ export default {
     },
     handleAllAdd() {
       this.conditList2 = this.leftData;
-
       this.leftData = [];
     },
     handleAllDelete() {
@@ -610,7 +627,6 @@ export default {
           if (i == this.arrIndex) {
             this.$set(this.conditionBox, i, [
               ...this.conditList2,
-
               ...this.conditionBox[i],
             ]);
             console.log(this.conditionBox);
@@ -622,9 +638,9 @@ export default {
         this.$errorMsg("请选择内容");
       }
     },
-    handleresale(){
-     Object.assign(this.$data, this.$options.data());
-    }
+    handleresale() {
+      Object.assign(this.$data, this.$options.data());
+    },
   },
   components: {
     AddModel,

src/views/supply/policy/components/Untitled-1.json

@@ -1,216 +0,0 @@
-{
-  "code": 1,
-  "msg": "操作成功",
-  "time": 1656664932,
-  "data": [
-    {
-      "id": 413749,
-      "belong_company_id": 2,
-      "belong_company": "S9219801",
-      "websit_number": "S2106770",
-      "worker_order_no": "2220220609135011878913",
-      "order_product_id": 238993,
-      "worker_id": 32087,
-      "worker_name": "罗世奇",
-      "worker_number": "S21067700116",
-      "worker_phone": "16626205908",
-      "wxgid": 6113138,
-      "inside_code": "18899758682TT",
-      "inside_code2": "",
-      "inside_password": "",
-      "inside_password2": "",
-      "out_code": "19998875682XC",
-      "out_password": "",
-      "source": "mobile",
-      "type": "insideAndOut",
-      "inside_picture": "uploads\/signwater\/2022-06-09\/202206091351344549307779035495.png",
-      "inside2_picture": "",
-      "out_picture": "uploads\/signwater\/2022-06-09\/202206091352082964314481740076.png",
-      "machine_picture": "",
-      "other_picture": null,
-      "vacuo_picture": "",
-      "safety_picture": "",
-      "switch_picture": "",
-      "bracket": "",
-      "pipe": "",
-      "switch_flag": "",
-      "high_altitude": "",
-      "hole": "",
-      "remark": "",
-      "video": "",
-      "status": "1",
-      "temp_save_remark": "",
-      "firsttime": 1654753958,
-      "createtime": "2022-06-09 13:50:11",
-      "updatetime": "2022-06-09 13:52:38",
-      "deletetime": null,
-      "onwall_picture": "",
-      "assist_remark": "",
-      "running_water_tds": "",
-      "machine_running_tds": "",
-      "water_pressure": "",
-      "in_style": "",
-      "in_number": "",
-      "in_style2": "",
-      "in_number2": "",
-      "out_style": "",
-      "out_number": "",
-      "main_number": "101",
-      "small_number": "1104",
-      "main_id": 101,
-      "small_id": 125,
-      "series_id": 0,
-      "product_id": 633678,
-      "province": "广东省",
-      "city": "广州市",
-      "area": "天河区",
-      "street": "华景西街",
-      "lat": "23.135519",
-      "lng": "113.35693",
-      "gps_address": "广东省广州市天河区华景西街",
-      "is_sync": "0",
-      "main_area": "",
-      "tmguid": "",
-      "clearing": 0,
-      "clearing_amount": 0,
-      "clearing_time": 0,
-      "business_id": 0,
-      "sales_type": "",
-      "main_name": "家用空调",
-      "small_name": "变频挂机",
-      "series_name": "",
-      "pname": "KFR-35GW\/(35518)FNhAa-B1(WIFI)(含管) 顶(珊瑚玉)",
-      "clearing_wid": 0,
-      "clearing_wname": "",
-      "sales_wid": 0,
-      "code_index": 1,
-      "detail_id": "202206091351583465596187437781",
-      "inside_num": 1,
-      "out_num": 1,
-      "old_websit_number": "",
-      "settle_old_websit_number": "",
-      "pgguid": "98125116633360DA7593C5373F883B45",
-      "pgwcmxid": "628ba2dbe7b811ec82a700163e09459f",
-      "detail_source": 1,
-      "cj_send_flag": 1,
-      "wg_send_flag": 1,
-      "pgmxid": "",
-      "push_settle_system_status": 0,
-      "push_settle_system_num": 0,
-      "operator_account": "",
-      "operator_name": "",
-      "operator_websit_number": "",
-      "operator_websit_name": "",
-      "main_responsible_number": "S21067700116",
-      "main_responsible_name": "罗世奇",
-      "main_settle_ratio": "60.00",
-      "assist_responsible_number": "S21067700117",
-      "assist_responsible_name": "邹今长",
-      "assist_settle_ratio": "40.00",
-      "reset_password_num": 0,
-      "is_install_engineer": 0,
-      "is_system_vacuum": 0,
-      "is_decode": 0,
-      "is_test": 0,
-      "order_install_detail_append": [
-        {
-          "id": 638259,
-          "belong_company_id": 2,
-          "belong_company": "S9219801",
-          "websit_number": "S2106770",
-          "worker_order_no": "2220220609135011878913",
-          "detail_id": "202206091351583465596187437781",
-          "name": "外机",
-          "type": 1,
-          "remark": "",
-          "path": "uploads\/signwater\/2022-06-09\/202206091352082964314481740076.png",
-          "append_index": 0,
-          "createtime": "2022-06-09 13:52:38",
-          "updatetime": "2022-06-09 13:52:42",
-          "pgguid": "98125116633360DA7593C5373F883B45",
-          "pgwcmxid": "628ba2dbe7b811ec82a700163e09459f",
-          "gree_image_id": "1_p_220609_S2106770_6qzGGSv5q2gC8LAG8mnZ5d.png",
-          "attempts_gree": 1,
-          "fjguid": "628c6ca8e7b811ec82a700163e09459f",
-          "type_text": "out_picture",
-          "path_url": "https:\/\/aliyunoss.zfire.top\/uploads\/signwater\/2022-06-09\/202206091352082964314481740076.png?OSSAccessKeyId=LTAI4G3XTLh8G8DiTpXHpWgt&Expires=1656669600&Signature=deSwTgvsMp47pYEdPbGYvbsJcDc%3D"
-        },
-        {
-          "id": 638260,
-          "belong_company_id": 2,
-          "belong_company": "S9219801",
-          "websit_number": "S2106770",
-          "worker_order_no": "2220220609135011878913",
-          "detail_id": "202206091351583465596187437781",
-          "name": "内机",
-          "type": 0,
-          "remark": "",
-          "path": "uploads\/signwater\/2022-06-09\/202206091351344549307779035495.png",
-          "append_index": 0,
-          "createtime": "2022-06-09 13:52:38",
-          "updatetime": "2022-06-09 13:52:42",
-          "pgguid": "98125116633360DA7593C5373F883B45",
-          "pgwcmxid": "628ba2dbe7b811ec82a700163e09459f",
-          "gree_image_id": "1_p_220609_S2106770_MjO5iJx~tXsChKkSM0a077.png",
-          "attempts_gree": 1,
-          "fjguid": "628ca877e7b811ec82a700163e09459f",
-          "type_text": "inside_picture",
-          "path_url": "https:\/\/aliyunoss.zfire.top\/uploads\/signwater\/2022-06-09\/202206091351344549307779035495.png?OSSAccessKeyId=LTAI4G3XTLh8G8DiTpXHpWgt&Expires=1656669600&Signature=zJLwBSkAu0OaRd%2Flwmawory9lsA%3D"
-        },
-        {
-          "id": 638261,
-          "belong_company_id": 2,
-          "belong_company": "S9219801",
-          "websit_number": "S2106770",
-          "worker_order_no": "2220220609135011878913",
-          "detail_id": "202206091351583465596187437781",
-          "name": "上墙",
-          "type": 7,
-          "remark": "",
-          "path": "uploads\/signwater\/2022-06-09\/202206091351407681921520646404.png",
-          "append_index": 0,
-          "createtime": "2022-06-09 13:52:38",
-          "updatetime": "2022-06-09 13:52:42",
-          "pgguid": "98125116633360DA7593C5373F883B45",
-          "pgwcmxid": "628ba2dbe7b811ec82a700163e09459f",
-          "gree_image_id": "1_p_220609_S2106770_H6ASyn00qSSAPm~G2-vMd0.png",
-          "attempts_gree": 1,
-          "fjguid": "628cd3e0e7b811ec82a700163e09459f",
-          "type_text": "onwall_picture",
-          "path_url": "https:\/\/aliyunoss.zfire.top\/uploads\/signwater\/2022-06-09\/202206091351407681921520646404.png?OSSAccessKeyId=LTAI4G3XTLh8G8DiTpXHpWgt&Expires=1656669600&Signature=W3CtkhYhjDC%2B7Y1%2FX7est%2BrVUtQ%3D"
-        },
-        {
-          "id": 638262,
-          "belong_company_id": 2,
-          "belong_company": "S9219801",
-          "websit_number": "S2106770",
-          "worker_order_no": "2220220609135011878913",
-          "detail_id": "202206091351583465596187437781",
-          "name": "外机其它",
-          "type": 5,
-          "remark": "",
-          "path": "uploads\/signwater\/2022-06-09\/202206091352131314372691101322.png",
-          "append_index": 0,
-          "createtime": "2022-06-09 13:52:38",
-          "updatetime": "2022-06-09 13:52:42",
-          "pgguid": "98125116633360DA7593C5373F883B45",
-          "pgwcmxid": "628ba2dbe7b811ec82a700163e09459f",
-          "gree_image_id": "1_p_220609_S2106770_QrCocPJTtZ0Y775pygzIb8.png",
-          "attempts_gree": 1,
-          "fjguid": "628cfc35e7b811ec82a700163e09459f",
-          "type_text": "out_other_picture",
-          "path_url": "https:\/\/aliyunoss.zfire.top\/uploads\/signwater\/2022-06-09\/202206091352131314372691101322.png?OSSAccessKeyId=LTAI4G3XTLh8G8DiTpXHpWgt&Expires=1656669600&Signature=GK6jlt8h%2F%2BNVRQS91KXCxFVYC6c%3D"
-        }
-      ],
-      "order_install_detail_code": [],
-      "type_text": "一内一外",
-      "status_text": "已采集",
-      "detail_source_text": "广佛系统",
-      "is_sync_text": "Is_sync 0",
-      "clearing_time_text": "1970-01-01 08:00:00",
-      "responsible_text": "罗世奇\/邹今长",
-      "is_system_vacuum_text": "已完成真空保存",
-      "firsttime_text": "2022-06-09 13:52:38"
-    }
-  ]
-}

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

@@ -442,7 +442,6 @@
                     filterable
                     style="width: 100%"
                   >
-                  <el-option label="不使用" value=""></el-option>
                     <el-option
                       v-for="(item,index) in policyList"
                       :key="index"
@@ -459,7 +458,6 @@
                     placeholder="选择销售类型"
                     style="width: 100%"
                   >
-                    <el-option label="不使用" value=""></el-option>
                     <el-option
                       v-for="item in ztypeList"
                       :key="item.id"
@@ -604,7 +602,7 @@
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="8" :lg="8" class="tr">
-                <el-button type="primary" size="small">查询</el-button>
+                <el-button type="primary" size="small"    @click="handlePolicyTypeList">查询</el-button>
               </el-col>
             </el-row>
           </el-form>
@@ -886,6 +884,7 @@
           this.goodsList = data.retailOrderItemList;
         });
       },
+      // 获取销售政策
       getPolicyList() {
         policyList({
           pageNum: 1,
@@ -893,6 +892,7 @@
         }).then((res) => {
           console.log(res, "tyep");
           this.policyList = res.data.records;
+          this.screenForm.policyId = res.data.records[0].code
         });
       },
       getTypeList() {
@@ -935,6 +935,7 @@
             res.data.records[i].qty = 1;
           }
           this.dataList = res.data.records;
+          this.screenForm.policyId = ''
         });
       },
       getMaterialTypeList() {
@@ -947,6 +948,7 @@
 
         });
       },
+      //引用销售政策搜索
       handlePolicyTypeList() {
         this.getpolicyTypeList();
       },