更改政策订单需求

src/api/basic_data/warehouse.js

@@ -133,3 +133,16 @@ export function addReserve(params) {
     data:params
   })
 }
+
+
+
+
+
+
+export function setStock(params) {
+  return request({
+    url: '/stock/update',
+    method: 'post',
+    data:params
+  })
+}

src/api/supply/policy.js

@@ -192,3 +192,15 @@ export function getConditionDetail(params) {
     params
   })
 }
+
+
+// 政策条件
+
+export function getPolicyConditionList(params) {
+  return request({
+    url: '/policy/condition/list',
+    method: 'get',
+    params
+  })
+}
+

src/views/basic_data/logistics/logistics_list.vue

@@ -40,7 +40,7 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" size="small" @click="hanleAdd"
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="hanleAdd"
           >新增</el-button
         >
         <el-popconfirm

src/views/basic_data/material/machine_list.vue

@@ -61,6 +61,7 @@
         <el-button
           type="primary"
           size="small"
+             icon="el-icon-plus"
           @click="(showDialogForm = true), (type = 1)"
           >新增</el-button
         >
@@ -76,6 +77,7 @@
           <el-button
             slot="reference"
             type="primary"
+               icon="el-icon-delete"
             size="small"
             class="textColor el-popover-left"
             >删除</el-button

src/views/basic_data/material/modify_list.vue

@@ -61,7 +61,7 @@
       <!-- 按钮 -->
       <div class="btn-group clearfix">
         <div class="fl">
-          <el-button type="primary" size="small" @click="addFn">新增</el-button>
+          <el-button type="primary"   icon="el-icon-plus" size="small" @click="addFn">新增</el-button>
           <!-- <el-button type="primary" size="small">编辑</el-button> -->
           <el-popconfirm
             confirm-button-text="好的"
@@ -74,6 +74,7 @@
             <el-button
               type="primary"
               size="small"
+                icon="el-icon-delete"
               slot="reference"
               class="el-popover-left"
               >删除</el-button

src/views/basic_data/material/relation_list.vue

@@ -117,6 +117,7 @@
       <div class="fl">
         <el-button
           type="primary"
+             icon="el-icon-plus"
           size="small"
           @click="(showDialogForm = true), (type = 1), hanleMachine()"
           >新增</el-button
@@ -133,6 +134,7 @@
           <el-button
             type="primary"
             size="small"
+               icon="el-icon-delete"
             slot="reference"
             class="el-popover-left"
             >删除</el-button

src/views/basic_data/warehouse/components/warehouse_list-detail.vue

@@ -258,7 +258,7 @@
                        <el-col :span="12"
                       >
                     <el-form-item label="允许客户查询" size="small">
-                        <el-checkbox :readonly="isReadonly" v-model="detail.allowMinusQty" :label="true">{{''}}</el-checkbox>
+                        <el-checkbox :readonly="isReadonly" v-model="detail.inquire" :true-label="1" :false-label="0">{{''}}</el-checkbox>
                     </el-form-item>
 
                      </el-col>
@@ -300,7 +300,7 @@
                          <el-col :span="12"
                       >
                            <el-form-item label="虚拟仓" size="small">
-                        <el-checkbox :readonly="isReadonly" v-model="detail.stockType" :label="1" :value="1">{{''}}</el-checkbox>
+                        <el-checkbox :readonly="isReadonly" v-model="detail.stockType" :true-label="1" :false-label="0">{{''}}</el-checkbox>
                     </el-form-item>
 
                       </el-col>
@@ -352,13 +352,16 @@
             </el-col>
           </el-row>
         </div>
+        <el-button type="primary"  @click="setStock">保存</el-button>
+
       </el-card>
     </el-form>
   </div>
 </template>
 
 <script>
-import { type } from "os";
+
+import { setStock } from "@/api/basic_data/warehouse";
 
 export default {
   props: {
@@ -412,6 +415,16 @@ export default {
       console.log(this.$parent);
       this.$parent.isShow = true;
     },
+    setStock(){
+      setStock({
+        inquire:this.detail.inquire,
+        stockType:this.detail.stockType,
+        id:this.detail.id
+      }).then((res) => {
+        this.$successMsg('保存成功')
+         this.$parent.isShow = true;
+      })
+    }
   },
 };
 </script>

src/views/basic_data/warehouse/warehouse_cost.vue

@@ -36,6 +36,7 @@
         <el-button
           type="primary"
           size="small"
+          icon="el-icon-plus"
           @click="(showDialog = true), (type = 1)"
           >新增</el-button
         >
@@ -51,6 +52,7 @@
           <el-button
             type="primary"
             size="small"
+            icon="el-icon-delete"
             slot="reference"
             class="el-popover-left"
             >批量删除</el-button

src/views/basic_data/warehouse/warehouse_site.vue

@@ -41,7 +41,7 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" size="small" @click="newData(), (type = 1)"
+        <el-button type="primary" icon="el-icon-plus" size="small" @click="newData(), (type = 1)"
           >新增</el-button
         >
   <el-popconfirm
@@ -55,6 +55,7 @@
                 <el-button
                   slot="reference"
                     type="primary"
+                        icon="el-icon-delete"
                    size="small"
                   class="textColor el-popover-left"
                   >批量删除</el-button

src/views/sales_policy/components/AddCondition.vue

@@ -236,6 +236,7 @@
                         <el-table-column
                           type="selection"
                           width="55"
+                          :selectable="selectable"
                           align="center"
                         >
                         </el-table-column>
@@ -452,6 +453,8 @@ export default {
       arrIndex: 0,
       popArr: {},
       fang: false,
+      newConditionBox: [],
+      currentPage: 1,
     };
   },
   created() {
@@ -470,11 +473,26 @@ export default {
         this.$parent.isCondition = 0;
       }
     },
+    /**
+     * 根据条件禁用行复选框
+     * 函数返回值为false则禁用选择(反之亦然)
+     * @param {Object} row - 行数据
+     * @param {String} index - 索引值
+     * @return Boolean
+     */
+    selectable: function (row, index) {
+      // row.disabled == undefined 才能被选中
+      if (row.disabled == undefined) {
+        return true;
+      }
+      // 函数必须有返回值且是布尔值
+      // 页面刷新后该函数会执行 N 次进行判断(N 为表格行数)
+      // 如果没有返回值则默认返回false(全部无法选中)
+    },
     getCommonApi() {
       if (this.id) {
         getConditionMaterialDetail({ id: this.policyId }).then((res) => {
           this.pop = res.data.pop;
-
           let pop = res.data.pop.split(":");
           for (let i = 0; i < pop.length; i++) {
             if (i == 0) {
@@ -541,15 +559,23 @@ export default {
       };
       addPoliyCondition(params).then((res) => {
         this.$successMsg("添加成功");
+
+        this.newConditionBox = this.conditList;
+        this.conditionBox = [[], []];
+        this.conditionBoxs = [];
+        this.limit = "";
+        this.pop = "";
+        this.popArr = {};
         this.$parent.isCondition = 0;
         this.$parent.isFlag = 1;
-        Object.assign(this.$data,this.$options.data())
+        // Object.assign(this.$data, this.$options.data());
         this.$emit("handleSubmitCon", this.comCode);
       });
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
+
     // 筛选全部数据
     hanleSelectAll(selection, index) {
       this.arrIndex = index;
@@ -569,39 +595,48 @@ export default {
         }
       }
     },
+    // 更改每页数量
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.currentPage = 1;
+      this.getMaterialLists(this.arrIndex);
+    },
+    // 更改当前页
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getMaterialLists(this.arrIndex);
+    },
+    // 更改列表当前页
+    handleTableCurrentChange(val) {
+      this.currentPage = val;
+      this.getMaterialLists(this.arrIndex);
+    },
     getMaterialLists(index) {
       this.arrIndex = index;
-      if (!this.fang) {
-        getMaterialList({
-          pageNum: this.currentPage,
-          pageSize: this.pageSize,
-          saleTypeCode: this.saleTypeCode,
-          policyId: this.comCode,
-        }).then((res) => {
-          this.conditList = res.data.records;
-          this.listTotal = res.data.total;
-          this.fang = true;
-        });
-      } else {
-        console.log('fang');
-
+      getMaterialList({
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        saleTypeCode: this.saleTypeCode,
+        policyId: this.comCode,
+      }).then((res) => {
         let datas = [];
-
-      for (let j = 0; j < this.conditionBox.length; j++) {
-            datas = [...datas, ...this.conditionBox[j]];
+        for (let j = 0; j < this.conditionBox.length; j++) {
+          datas = [...datas, ...this.conditionBox[j]];
         }
-        for (let i = 0; i < this.conditList.length; i++) {
-           if (datas.length) {
-              for (let k = 0; k < datas.length; k++) {
-                if (datas[k].id == this.conditList[i].id) {
-                  this.conditList.splice(i,1)
-
-                }
+        const newData = datas.length ? datas : this.newConditionBox;
+        console.log(newData, "newData");
+        if (newData.length) {
+          for (let i = 0; i < res.data.records.length; i++) {
+            for (let k = 0; k < newData.length; k++) {
+              if (newData[k].id == res.data.records[i].id) {
+                res.data.records[i].disabled = true;
               }
+            }
           }
         }
-         this.listTotal = this.conditList.length;
-      }
+        this.conditList = res.data.records;
+        this.listTotal = res.data.total;
+      });
     },
     handleSelectionAllChange(e) {
       this.leftData = e;
@@ -643,13 +678,11 @@ export default {
     handleDiaSubmit() {
       if (this.conditList2.length) {
         for (let i = 0; i < this.conditionBox.length; i++) {
-          console.log(this.conditionBox[i]);
           if (i == this.arrIndex) {
             this.$set(this.conditionBox, i, [
               ...this.conditList2,
               ...this.conditionBox[i],
             ]);
-            console.log(this.conditionBox);
           }
         }
         this.VisibleModle = false;

src/views/sales_policy/components/Examine.vue

@@ -365,7 +365,7 @@ export default {
         examineRemark: this.remark,
       }).then((res) => {
         this.$successMsg("已提交审核");
-        this.isShow = 1;
+        this.$parent.isShow = 1;
         this.$parent.getList()
       });
     },

src/views/sales_policy/policy_list.vue

@@ -153,7 +153,9 @@
     </div>
     <div class="btn-group">
       <el-row type="flex">
-        <el-button type="primary" class="btn" size="small" @click="hanlenewInfo"
+        <el-button  size="small"
+              type="primary"
+              icon="el-icon-plus"   @click="hanlenewInfo"
           >新增</el-button
         >
       </el-row>
@@ -414,6 +416,7 @@ listLoading:false,
       console.log(params,123);
       getList(params).then((res) => {
         this.dataList = res.data.records;
+        console.log(this.dataList);
         this.listTotal = res.data.total;
         this.listLoading = false
 

src/views/sales_rebate/rebate_list.vue

@@ -167,25 +167,25 @@
             ></el-input>
           </el-form-item>
 
-          <el-form-item label="销售类型编码" prop="saleTypeCode">
+          <el-form-item label="销售类型名称" prop="saleTypeName">
             <el-select
               v-model="dialogForm.saleTypeCode"
               :disabled="type == 3"
               @change="handleChange"
-              placeholder="请选择类型编码"
+              placeholder="请选择销售类型编码"
             >
               <el-option
                 v-for="item in typeList"
                 :key="item.sysDictId"
-                :label="item.dictValue"
+                :label="item.saleName"
                 :value="item.saleCode"
               >
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="销售类型名称" prop="saleTypeName">
+          <el-form-item label="销售类型编码" prop="saleTypeCode">
             <el-input
-              v-model="dialogForm.saleTypeName"
+              v-model="dialogForm.saleTypeCode"
               :readonly="true"
             ></el-input>
           </el-form-item>
@@ -441,6 +441,7 @@ export default {
     hanelclose() {
       this.type = "";
       this.hanleReset();
+       this.$refs.dialogForm.resetFields();
     },
     handelInfo() {
       console.log(this.$refs.dialogForm);

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

@@ -5,7 +5,11 @@
       <div class="title">提货进度</div>
     </div>
     <div class="progress-container">
-      <el-progress :text-inside="true" :stroke-width="26" :percentage="detailData.thjd ? (detailData.thjd * 1000 / 10) : 0"></el-progress>
+      <el-progress
+        :text-inside="true"
+        :stroke-width="26"
+        :percentage="detailData.thjd ? (detailData.thjd * 1000) / 10 : 0"
+      ></el-progress>
     </div>
 
     <div class="main-title">
@@ -16,47 +20,47 @@
       <el-row>
         <el-col :span="8" class="item">
           <div class="label">订单号</div>
-          <div class="value">{{detailData.id}}</div>
+          <div class="value">{{ detailData.id }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">订单日期</div>
-          <div class="value">{{detailData.theTime}}</div>
+          <div class="value">{{ detailData.theTime }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">单据状态</div>
-          <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+          <div class="value">{{ detailData.examineStatus | statusFilter }}</div>
         </el-col>
         <el-col :span="16" class="item">
           <div class="label">备注</div>
-          <div class="value">{{detailData.remark}}</div>
+          <div class="value">{{ detailData.remark }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">业务员</div>
-          <div class="value">{{detailData.serviceName}}</div>
+          <div class="value">{{ detailData.serviceName }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单人</div>
-          <div class="value">{{detailData.createName}}</div>
+          <div class="value">{{ detailData.createName }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">制单日期</div>
-          <div class="value">{{detailData.createTime}}</div>
+          <div class="value">{{ detailData.createTime }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">审核人</div>
-          <div class="value">{{detailData.examineName}}</div>
+          <div class="value">{{ detailData.examineName }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">审核日期</div>
-          <div class="value">{{detailData.examineTime}}</div>
+          <div class="value">{{ detailData.examineTime }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">关闭人</div>
-          <div class="value">{{detailData.closeName}}</div>
+          <div class="value">{{ detailData.closeName }}</div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">关闭日期</div>
-          <div class="value">{{detailData.closeTime}}</div>
+          <div class="value">{{ detailData.closeTime }}</div>
         </el-col>
       </el-row>
     </div>
@@ -66,43 +70,177 @@
     </div>
 
     <div class="table" style="margin-top: 20px">
-      <el-table :data="detailData.retailOrderItemList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
-        <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-        <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
-<el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="100" show-overflow-tooltip>
-                <template slot-scope="scope">
-
-                  <el-tag type="success" size="small"  v-if="scope.row.customerWalletName2">
-                      {{scope.row.customerWalletName2}}
-                  </el-tag>
-
-                </template>
-               </el-table-column>        <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+      <el-table
+        :data="detailData.retailOrderItemList"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+        max-height="400"
+      >
+        <el-table-column
+          align="center"
+          label="序号"
+          type="index"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="销售类型"
+          prop="saleTypeName"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="产品编码"
+          prop="materialCode"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="产品名称"
+          prop="materialName"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="规格型号"
+          prop="specification"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="单位"
+          prop="unit"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="单价"
+          prop="price"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="数量"
+          prop="qty"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="订单金额"
+          prop="totalAmount"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="返利类型"
+          prop="customerWalletName2"
+          min-width="200"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-tag
+              type="success"
+              size="small"
+              v-if="scope.row.customerWalletName2"
+            >
+              {{ scope.row.customerWalletName2 }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="返利金额"
+          prop="payRebateAmount"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="格力折扣"
+          prop="totalDiscAmount"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="现金钱包"
+          prop="customerWalletName"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="金额"
+          prop="payAmount"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="是否直调"
+          prop="isDirectTransfer"
+          min-width="100"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
-            {{scope.row.isDirectTransfer ? '是':'否'}}
+            {{ scope.row.isDirectTransfer ? "是" : "否" }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="原订单数量" prop="oldQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          align="center"
+          label="直调数量"
+          prop="directTransferQty"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="原订单数量"
+          prop="oldQty"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="备注"
+          prop="remark"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="税率"
+          prop="tax"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
       </el-table>
     </div>
-  <div class="page-footer">
+    <div class="page-footer">
       <div class="footer" :class="classObj">
-        <!-- <el-button type="primary" @click="openDeliverDialog" :disabled="detailData.examineStatus !== 'OK'">直调发货</el-button> -->
-        <el-button type="primary" @click="handleFinish" :disabled="detailData.examineStatus !== 'OK'">直调完成</el-button>
+        <el-button
+          type="primary"
+          @click="openDeliverDialog"
+          :disabled="detailData.examineStatus !== 'OK'"
+          >直调发货</el-button
+        >
+        <el-button
+          type="primary"
+          @click="handleFinish"
+          :disabled="detailData.examineStatus !== 'OK'"
+          >直调完成</el-button
+        >
         <!-- <el-button @click="goBack">关 闭</el-button> -->
       </div>
     </div>
@@ -114,20 +252,22 @@
         <el-row :gutter="0">
           <el-col :span="12" class="item">
             <div class="label">审批人</div>
-            <div class="value">{{detailData.examineName}}</div>
+            <div class="value">{{ detailData.examineName }}</div>
           </el-col>
           <el-col :span="12" class="item">
             <div class="label">审批结果</div>
-            <div class="value">{{detailData.examineStatus | statusFilter}}</div>
+            <div class="value">
+              {{ detailData.examineStatus | statusFilter }}
+            </div>
           </el-col>
           <el-col :span="24" class="item">
             <div class="label">审批说明</div>
-            <div class="value">{{detailData.examineRemark}}</div>
+            <div class="value">{{ detailData.examineRemark }}</div>
           </el-col>
         </el-row>
       </div>
     </div>
-<!--
+    <!--
     <div class="page-footer">
       <div class="footer" :class="classObj">
         <el-button type="primary" @click="openDeliverDialog">直调发货</el-button>
@@ -136,33 +276,59 @@
     </div> -->
 
     <el-dialog title="直调发货" :visible.sync="isShowDeliverDialog" width="80%">
-      <el-form ref="deliverForm" :model="deliverForm" label-width="70px" size="small" label-position="left">
+      <el-form
+        ref="deliverForm"
+        :model="deliverForm"
+        :rules="deliverFormRules"
+        label-width="80px"
+        size="small"
+        label-position="left"
+      >
         <el-row :gutter="20">
-          <el-col :xs="24" :sm="8" :lg="8">
-            <el-form-item label="工程订单" prop="orderNum">
-              <el-input v-model="deliverForm.orderNum" placeholder="请输入工程订单"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="8" :lg="8" style="height: 51px;">
+          <el-col :xs="8" :sm="8" :lg="8" style="height: 51px">
             <el-form-item label="发货日期" prop="date">
               <el-date-picker
                 v-model="deliverForm.date"
                 type="date"
                 value-format="yyyy-MM-dd"
-                style="width: 100%;"
-                placeholder="选择日期">
+                style="width: 100%"
+                placeholder="选择日期"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="8" :lg="8">
+          <el-col :xs="8" :sm="8" :lg="8">
             <el-form-item label="发货仓库" prop="warehouse">
-              <el-select v-model="deliverForm.warehouse" placeholder="请选择发货仓库">
+              <el-select
+                v-model="deliverForm.warehouse"
+                placeholder="请选择发货仓库"
+                style="width: 100%"
+                filterable
+                @change="changeWarehouse"
+              >
                 <el-option
                   v-for="item in warehouseList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="8" :sm="8" :lg="8">
+            <el-form-item label="选择仓位" prop="position">
+              <el-select
+                v-model="deliverForm.position"
+                placeholder="请选择仓位"
+                style="width: 100%"
+                filterable
+              >
+                <el-option
+                  v-for="item in positionList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -170,30 +336,120 @@
       </el-form>
 
       <div class="table" style="margin-top: 20px">
-        <el-table :data="detailData.retailOrderItemList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
-          <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-          <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编码" prop="materialCode" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="返利类型" prop="walletRebateName" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="格力折扣" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="现金钱包" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="实付金额" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+        <el-table
+          :data="goodsList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+          max-height="400"
+        >
+          <el-table-column
+            align="center"
+            label="序号"
+            type="index"
+            width="50"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="销售类型"
+            prop="saleTypeName"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="产品编码"
+            prop="materialCode"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="产品名称"
+            prop="materialName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="规格型号"
+            prop="specification"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="单位"
+            prop="unit"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="订单数量"
+            prop="qty"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="发货数量"
+            prop="hasSendQty"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="直调数量"
+            prop="adjustNum"
+            min-width="100"
+            show-overflow-tooltip
+          >
             <template slot-scope="scope">
-              {{scope.row.isDirectTransfer ? '是':'否'}}
+              <el-input
+                v-model="scope.row.adjustNum"
+                size="small"
+                type="number"
+              ></el-input>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="原订单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="税率" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column
+            align="center"
+            label="单价"
+            prop="price"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="金额"
+            prop="totalAmount"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利"
+            prop="rebateAmount"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="实付金额"
+            prop="payAmount"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="备注"
+            prop="remark"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
         </el-table>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -201,28 +457,31 @@
         <el-button type="primary" @click="submitDeliverForm">确 定</el-button>
       </span>
     </el-dialog>
-
   </div>
 </template>
 
 <script>
 import { getDetail } from "@/api/supply/policy";
-
+import {
+  getWarehouseList,
+  adjustDeliver,
+  finishData,
+} from "@/api/supply/retail";
 export default {
-  name: 'RetailDetail',
-  componentName: 'RetailDetail',
-  props: ['listItem'],
+  name: "RetailDetail",
+  componentName: "RetailDetail",
+  props: ["listItem"],
   filters: {
     statusFilter(val) {
       const statusList = [
-        { label: '已保存', value: 'SAVE' },
-        { label: '待审核', value: 'WAIT' },
-        { label: '审核通过', value: 'OK' },
-        { label: '审核驳回', value: 'FAIL' },
+        { label: "已保存", value: "SAVE" },
+        { label: "待审核", value: "WAIT" },
+        { label: "审核通过", value: "OK" },
+        { label: "审核驳回", value: "FAIL" },
       ];
-      let obj = statusList.find(o => o.value == val);
-      return obj ? obj.label : ''
-    }
+      let obj = statusList.find((o) => o.value == val);
+      return obj ? obj.label : "";
+    },
   },
   data() {
     return {
@@ -230,30 +489,48 @@ export default {
 
       isShowDeliverDialog: false,
       deliverForm: {
-        orderNum: '',
-        date: '',
+        date: "",
+        warehouse: "",
+        position: "",
+      },
+      deliverFormRules: {
+        date: [
+          { required: true, message: "请选择发货日期", trigger: "change" },
+        ],
+        warehouse: [
+          { required: true, message: "请选择发货仓库", trigger: "change" },
+        ],
+        position: [
+          { required: true, message: "请选择仓位", trigger: "change" },
+        ],
       },
       warehouseList: [],
-    }
+      positionList: [],
+
+      goodsList: [],
+    };
   },
 
   computed: {
     sidebar() {
-      return this.$store.state.app.sidebar
+      return this.$store.state.app.sidebar;
     },
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
-        openSidebar: this.sidebar.opened
-      }
+        openSidebar: this.sidebar.opened,
+      };
     },
     isExamine() {
-      return this.detailData.examineStatus === 'OK' || this.detailData.examineStatus === 'FAIL'
+      return (
+        this.detailData.examineStatus === "OK" ||
+        this.detailData.examineStatus === "FAIL"
+      );
     },
     progress() {
-      if(this.detailData.totalQty == 0) return 0;
+      if (this.detailData.totalQty == 0) return 0;
       return (this.detailData.takeQty * 100) / (this.detailData.totalQty * 100);
-    }
+    },
   },
 
   created() {
@@ -263,72 +540,121 @@ export default {
   methods: {
     // 返回列表
     goBack() {
-      this.$emit('backListFormDetail');
+      this.$emit("backListFormDetail");
     },
 
     // 获取详情
     getDetail() {
-      getDetail({id: this.listItem.id}).then(res => {
+      getDetail({ id: this.listItem.id }).then((res) => {
         this.detailData = res.data;
-      })
+      });
     },
- // 直调完成
+    // 直调完成
     handleFinish() {
-      this.$confirm('此操作将直调完成, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        finishData({
-          id: this.listItem.id
-        }).then(res => {
-          this.$successMsg();
-          this.getDetail();
+      this.$confirm("此操作将直调完成, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          finishData({
+            id: this.listItem.id,
+          }).then((res) => {
+            this.$successMsg();
+            this.getDetail();
+          });
         })
-      }).catch(() => {});
+        .catch(() => {});
+    },
+
+    // 获取仓库列表
+    getWarehouseList() {
+      getWarehouseList({
+        pageNum: 1,
+        pageSize: -1,
+      }).then((res) => {
+        this.warehouseList = res.data.records;
+      });
     },
+    // 更改仓库
+    changeWarehouse() {
+      this.deliverForm.position = "";
+      let obj = this.warehouseList.find(
+        (o) => o.id == this.deliverForm.warehouse
+      );
+      this.positionList = obj.kingDeeStocks;
+    },
+
     // 打开 直调发货
     openDeliverDialog() {
       this.isShowDeliverDialog = true;
+      this.goodsList = this.detailData.retailOrderItemList;
+      this.getWarehouseList();
     },
 
     // 关闭 直调发货
     closeDeliverDialog() {
       this.isShowDeliverDialog = false;
     },
-
     // 提交 直调发货
     submitDeliverForm() {
-
+      this.$refs.deliverForm.validate((valid) => {
+        if (valid) {
+          for (let i = 0; i < this.goodsList.length; i++) {
+            if (!this.goodsList[i].adjustNum) {
+              this.$errorMsg("请输入直调数量");
+              return;
+            }
+          }
+          let goodsList = this.goodsList.map((item) => {
+            return {
+              itemId: item.id,
+              qty: item.adjustNum,
+            };
+          });
+          let params = {
+            orderNo: this.listItem.id,
+            orderDate: this.deliverForm.date + " 00:00:00",
+            correspondId: this.deliverForm.warehouse,
+            stockId: this.deliverForm.position,
+            directItems: goodsList,
+          };
+          adjustDeliver(params).then((res) => {
+            this.$successMsg();
+            this.isShowDeliverDialog = false;
+            this.getDetail();
+          });
+        }
+      });
     },
-
-  }
-}
+  },
+};
 </script>
 
 <style scoped lang="scss">
-  .detail-container {
-    width: 100%;
-    height: 100%;
-  }
-  .main-title {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-top: 20px;
-    height: 60px;
-    border-bottom: 1px solid #DCDFE6;
-    margin-bottom: 20px;
-    .title {
-      font-size: 16px;
-      font-weight: 600;
-      padding-left: 10px;
-    }
+.detail-container {
+  width: 100%;
+  height: 100%;
+  margin-bottom: 50px;
+}
+.main-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 20px;
+  height: 60px;
+  border-bottom: 1px solid #dcdfe6;
+  margin-bottom: 20px;
+  .title {
+    font-size: 16px;
+    font-weight: 600;
+    padding-left: 10px;
   }
-  .progress-container {
-    display: flex;
-    .el-progress {
-      width: 500px;
-    }
+}
+.progress-container {
+  display: flex;
+  .el-progress {
+    width: 500px;
   }
+}
 </style>

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

@@ -876,8 +876,6 @@ export default {
            })[0][val]
 
         }
-
-
       };
     },
       pickerOptions({ $props }) {

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

@@ -0,0 +1,1258 @@
+<template>
+  <div class="detail-container">
+    <el-page-header
+      @back="goBack"
+      :content="listItem ? '编辑' : '新增'"
+    ></el-page-header>
+
+    <div class="main-title">
+      <div class="title">订单信息</div>
+    </div>
+
+    <el-form
+      ref="mainForm"
+      :model="mainForm"
+      :rules="mainFormRules"
+      label-width="120px"
+      size="small"
+      label-position="right"
+    >
+      <el-row :gutter="20">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :lg="8"
+          v-if="!listItem"
+          @click.native="handleShow"
+        >
+          <el-form-item label="销售政策编号" prop="policyCode">
+            <el-input
+              v-model="policyId"
+              placeholder="销售政策编号"
+              readonly
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8" v-else>
+          <el-form-item label="销售政策编号" prop="policyCode">
+            <el-input
+              v-model="mainForm.policyCode"
+              placeholder="销售政策编号"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8" style="height: 51px">
+          <el-form-item label="单据日期" prop="date">
+            <el-date-picker
+              v-model="mainForm.date"
+              type="datetime"
+              :picker-options="pickerOptions"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              style="width: 100%"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="12" :lg="8">
+          <el-form-item label="产品大类" prop="type">
+            <el-select
+              v-model="mainForm.type"
+              placeholder="选择产品大类"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in typeList"
+                :key="item.dictCode"
+                :label="item.dictValue"
+                :value="item.dictCode"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :xs="24" :sm="16" :lg="16">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="mainForm.remark"
+              placeholder="请输入备注"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div class="main-title">
+      <div class="title">货品信息</div>
+      <div v-if="!listItem">
+        <el-select
+          v-model="warehouseValue"
+          placeholder="请选择发货仓库"
+          size="small"
+          style="margin-right: 10px"
+        >
+          <el-option
+            :label="item.name"
+            :value="item.id"
+            v-for="(item, index) in warehouseList"
+            :key="index"
+          ></el-option>
+        </el-select>
+        <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-search"
+          @click="checkStock"
+          >检查库存</el-button
+        >
+        <el-divider direction="vertical"></el-divider>
+      </div>
+    </div>
+    <div class="table" style="margin-top: 20px">
+      <el-table
+        :data="goodsList"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+        max-height="400"
+      >
+        <el-table-column
+          align="center"
+          label="序号"
+          type="index"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="销售类型"
+          prop="saleTypeName"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="存货编码"
+          prop="materialNumber"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="产品名称"
+          prop="materialName"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="规格型号"
+          prop="specification"
+          min-width="160"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="单位"
+          prop="unit"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="单价"
+          prop="price"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="总数量"
+          prop="qty"
+          min-width="100"
+          show-overflow-tooltip
+        >
+          <!-- <template slot-scope="scope">
+            <el-input v-model="scope.row.qty" size="small"></el-input>
+          </template> -->
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="订单金额"
+          min-width="100"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{ scope.row.price * scope.row.qty }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="返利钱包"
+          prop="customerWalletId2"
+          min-width="160"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.customerWalletId2"
+              placeholder="选择返利钱包"
+              size="small"
+              @change="changeWallet(scope.$index)"
+            >
+              <el-option label="全部" value=""></el-option>
+              <el-option
+                v-for="item in scope.row.rebateWallets"
+                :key="item.customerWalletId"
+                :label="item.name"
+                :value="item.customerWalletId"
+              >
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="返利金额"
+          min-width="100"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{
+              (scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) /
+                100 || 0
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="格力折扣"
+          min-width="100"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{ scope.row.qty * scope.row.discAmount }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="现金钱包"
+          prop="customerWalletId"
+          min-width="160"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.customerWalletId"
+              placeholder="选择现金钱包"
+              size="small"
+            >
+              <el-option label="全部" value=""></el-option>
+              <el-option
+                v-for="item in scope.row.wallets"
+                :key="item.customerWalletId"
+                :label="item.name"
+                :value="item.customerWalletId"
+              >
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="实付金额"
+          prop="qty"
+          min-width="100"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{
+              (scope.row.price * scope.row.qty * 100 -
+                ((scope.row.price *
+                  scope.row.qty *
+                  (scope.row.rebateRate * 100)) /
+                  100) *
+                  100 -
+                ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) /
+                100 || 0
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="是否直调"
+          prop="isDirectTransfer"
+          min-width="100"
+        >
+          <template slot-scope="scope">
+            <el-checkbox v-model="scope.row.isDirectTransfer"></el-checkbox>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column
+          align="center"
+          label="直调数量"
+          prop="directTransferQty"
+          min-width="100"
+        >
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.directTransferQty"
+              size="small"
+            ></el-input>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          align="center"
+          label="备注"
+          prop="remark"
+          min-width="160"
+        >
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.remark" size="small"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="税率"
+          prop="tax"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          label="总仓库"
+          prop="status1"
+          min-width="100"
+          show-overflow-tooltip
+          v-if="!listItem"
+        >
+          <template slot-scope="scope">
+            <div>{{ scope.row.status1 | status1Filter }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="仓库状态"
+          prop="status2"
+          min-width="100"
+          show-overflow-tooltip
+          v-if="!listItem"
+        >
+          <template slot-scope="scope">
+            <div>{{ status2Filter(scope.row) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" width="100" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" @click="deleteItem(scope.$index)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div class="page-footer">
+      <div class="footer" :class="classObj">
+        <el-button type="primary" @click="clickSubmitForm">保 存</el-button>
+        <el-popconfirm
+          title="确定关闭吗？"
+          @onConfirm="goBack"
+          style="margin-left: 10px"
+        >
+          <el-button slot="reference">关 闭</el-button>
+        </el-popconfirm>
+      </div>
+    </div>
+
+    <el-dialog
+      :visible.sync="isShowDialog"
+      @close="handleClose"
+      width="80%"
+      :close-on-click-modal="false"
+      title="引用销售政策"
+    >
+      <template>
+        <el-form
+          :model="screenForm"
+          ref="screenForm"
+          label-width="120px"
+          size="small"
+        >
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="6" :lg="6">
+              <el-form-item label="销售政策">
+                <el-select
+                  v-model="screenForm.policyId"
+                  placeholder="选择销售政策"
+                  @change="handlePolicy"
+                  filterable
+                  :disabled="goodsList.length ? true : false"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="(item, index) in policyList"
+                    :key="index"
+                    :label="item.title"
+                    :value="item.code"
+                  ></el-option>
+                </el-select> </el-form-item
+            ></el-col>
+            <el-col :xs="24" :sm="6" :lg="6">
+              <el-form-item label="条件">
+                <el-select
+                  v-model="screenForm.factorId"
+                  filterable
+                  @change="handleFactor"
+                  placeholder="选择条件"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="(item, index) in factor"
+                    :key="item.id"
+                    :label="'条件' + (index + 1)"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="6" :lg="6">
+              <el-form-item label="销售类型">
+                <el-select
+                  v-model="screenForm.saleTypeCode"
+                  filterable
+                  placeholder="选择销售类型"
+                  style="width: 100%"
+                >
+                  <el-option label="全部" value=""></el-option>
+                  <el-option
+                    v-for="item in ztypeList"
+                    :key="item.id"
+                    :label="item.saleName"
+                    :value="item.saleCode"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="6" :lg="6" class="tr">
+              <el-button
+                type="primary"
+                size="small"
+                @click="handlePolicyTypeList"
+                >查询</el-button
+              >
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-row :gutter="20" style="margin: 10px 0">
+          {{cusIndex>0?'选择配提机型':'选择限定机型'}} {{'('+pop+')'}}
+        </el-row>
+        <el-table
+          v-loading="listLoading"
+          :data="popDataArr[cusIndex]"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          @selection-change="handleSelectionChange"
+          stripe
+        >
+          <el-table-column
+            align="center"
+            type="selection"
+            :selectable="selectable"
+            width="55"
+          >
+          </el-table-column>
+          <template v-for="col in columns">
+            <el-table-column
+              v-if="col.num"
+              align="center"
+              :label="col.lable"
+              :prop="col.prop"
+              :min-width="col.widht"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.qty" size="small"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-else-if="col.jie"
+              align="center"
+              :label="col.lable"
+              :prop="col.prop"
+              :min-width="col.widht"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                {{ scope.row.qty * scope.row.price || 0 }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-else
+              align="center"
+              :label="col.lable"
+              :prop="col.prop"
+              :min-width="col.widht"
+              show-overflow-tooltip
+            >
+            </el-table-column>
+          </template>
+        </el-table>
+        <div style="margin: 10px 0">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="total"
+          >
+          </el-pagination>
+        </div>
+        <span slot="footer" class="dialog-footer">
+          <el-button type="primary" v-if="cusIndex > 0" @click="handleShang"
+            >上一步</el-button
+          >
+          <el-button
+            type="primary"
+            @click="handleCondition"
+            v-if="popArr.length != cusIndex + 1"
+            >下一步</el-button
+          >
+          <el-button
+            type="primary"
+            @click="hanlePopData"
+            v-if="popArr.length == cusIndex + 1"
+            >完成</el-button
+          >
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getDetail,
+  addData,
+  editData,
+  getSalesTypeList,
+  getGoodsList,
+  getWalletList,
+  getWarehouseList,
+  policyList,
+  checkStock,
+  typeList,
+  getpolicyList,
+  getConditionList,
+  getConditionDetail,
+  getpolicyTypeList,
+  getPolicyConditionList,
+} from "@/api/supply/policy";
+import { getDictList } from "@/api/common";
+import { findElem } from "@/utils/util";
+
+export default {
+  name: "RetailForm",
+  componentName: "RetailForm",
+  props: ["listItem"],
+  filters: {
+    status1Filter(val) {
+      if (val === "" || val === null || val === undefined) return "未检查";
+      else if (val === 0) return "无货";
+      else if (val > 0 && val <= 30) return val;
+      else if (val > 30 && val <= 1000) return "有货";
+      else if (val > 1000) return "充足";
+    },
+  },
+  data() {
+    return {
+      tableData: [],
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
+      cusIndex: 0,
+      total: 0,
+      radio: "",
+      pop: "",
+      factor: [],
+      popArr: [],
+      mainForm: {
+        id: "",
+        date: "",
+        type: "",
+        ztype: "",
+        remark: "",
+        policyCode: "",
+        policyRemark: "",
+        policyId: "",
+      },
+      mainFormRules: {
+        date: [
+          { required: true, message: "请选择单据日期", trigger: "change" },
+        ],
+        type: [{ required: true, message: "请选择品类", trigger: "change" }],
+      },
+      goodsList: [],
+      warehouseList: [],
+      warehouseValue: "",
+      isShowDialog: false,
+      screenForm: {
+        policyId: "",
+        saleTypeCode: "",
+        factorId: "",
+      },
+      currentPage: 1,
+      listTotal: 0,
+      salesTypeList: [],
+      typeList: [],
+      ztypeList: [],
+      leftGoodsList: [],
+      rightGoodsList: [],
+      leftSelection: [],
+      rightSelection: [],
+      policyList: [],
+      xjWalletList: [],
+      flWalletList: [],
+      dataList: [],
+      columns: [
+        {
+          prop: "saleTypeName",
+          lable: "销售类型",
+          widht: 160,
+        },
+        {
+          prop: "materialName",
+          lable: "货品名称",
+          widht: 160,
+        },
+        {
+          prop: "specification",
+          lable: "规格型号",
+          widht: 160,
+        },
+
+        {
+          prop: "qty",
+          lable: "数量",
+          widht: 160,
+          num: true,
+        },
+        {
+          prop: "price",
+          lable: "单价",
+          widht: 160,
+        },
+        {
+          prop: "zong",
+          lable: "金额",
+          jie: true,
+        },
+      ],
+      listLoading: false,
+      popDataArr: [],
+      radioObj: {},
+      step: 0,
+      policyId: "",
+      policyConditionId: "",
+      multipleSelection: [],
+      multipleData: [],
+    };
+  },
+
+  computed: {
+    sidebar() {
+      return this.$store.state.app.sidebar;
+    },
+    classObj() {
+      return {
+        hideSidebar: !this.sidebar.opened,
+        openSidebar: this.sidebar.opened,
+      };
+    },
+    comxjWalletList() {
+      return (c) => {
+        console.log(c, "现金钱包");
+        const walle = [];
+        const ovalVall = c == undefined || !c.length ? [] : c;
+        for (let i = 0; i < this.xjWalletList.length; i++) {
+          for (let j = 0; j < ovalVall.length; j++) {
+            if (this.xjWalletList[i].walletRebateId == ovalVall[j].walletId) {
+              walle.push(this.xjWalletList[i]);
+            }
+          }
+        }
+        return walle;
+      };
+    },
+    comText() {
+      return (val) => {
+        if (this.cusIndex - 1 == 0) {
+          const params = this.radio.split("&");
+          return this.dataList.filter((k) => {
+            return k.id == params[0];
+          })[0][val];
+        } else {
+          const params =
+            this.radioObj["radio" + (this.cusIndex - 1)].split("&");
+          return this.popDataArr[this.cusIndex - 2].filter((k) => {
+            return k.id == params[0];
+          })[0][val];
+        }
+      };
+    },
+    pickerOptions({ $props }) {
+      return {
+        disabledDate: (time) => {
+          return time.getTime() < Date.now() - 1 * 24 * 60 * 60 * 1000;
+        },
+      };
+    },
+  },
+
+  created() {
+    this.getDictList();
+    this.getWalletList();
+    this.getWarehouseList();
+    this.getTypeList();
+    if (this.listItem) {
+      this.getDetail();
+    }
+  },
+  beforeUpdate() {},
+  methods: {
+    // 返回列表
+    goBack() {
+      this.$emit("backListFormDetail");
+    },
+    // 选择销售政策获取政策条件列表
+    handlePolicy(e) {
+      this.factor = [];
+      this.popDataArr = []
+      this.total = 0
+      this.screenForm.factorId = "";
+      // 选择销售政策PolidcyId改变获取条件列表
+      getPolicyConditionList({ policyId: e }).then((res) => {
+        this.factor = res.data;
+      });
+    },
+    //获取条件相对应的比列
+    handleFactor(e) {
+      const data = this.factor.filter((k) => {
+        return k.id == e;
+      })[0];
+      console.log(data, "kkkk");
+      this.pop = data.pop;
+      this.popArr = data.pop.split(":");
+
+      this.screenForm.policyId = data.policyId;
+      this.policyConditionId = data.id;
+    },
+    //引用销售政策搜索
+    handlePolicyTypeList() {
+      if (this.screenForm.factorId) {
+        this.getConditionList(this.policyConditionId, this.cusIndex + 1);
+      } else {
+        this.$errorMsg("必须要条件");
+      }
+    },
+    // 获取某一个比例下的数据 ,查询popType 当前 this.cusIndex+1
+    getConditionList(policyConditionId, popType) {
+      getConditionList({
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        policyConditionId,
+        popType,
+      }).then((res) => {
+        const datas = res.data.records;
+        this.total = res.data.total;
+        console.log(this.goodsList.length, 223424);
+        if (this.goodsList.length) {
+          for (let p = 0; p < this.goodsList.length; p++) {
+            for (let q = 0; q < datas.length; q++) {
+              if (this.goodsList[p].id == datas[q].id) {
+                datas[q].disabled = true;
+              }
+            }
+          }
+        }
+        for (let i = 0; i < res.data.records.length; i++) {
+          res.data.records[i].qty = 1;
+        }
+        if (this.popDataArr.length) {
+          this.popDataArr.splice(this.cusIndex, 1);
+        }
+        if (this.cusIndex == 0) {
+          this.popDataArr = [];
+        }
+
+        this.popDataArr = [...this.popDataArr, datas];
+      });
+    },
+    // 下一步获取某个政策条件比例数据
+    handleCondition() {
+      if (this.multipleSelection.length) {
+        this.cusIndex += 1;
+        this.multipleData.push(this.multipleSelection);
+        console.log(this.multipleData, "push", this.cusIndex);
+        this.getConditionList(this.policyConditionId, this.cusIndex + 1);
+      } else {
+        this.$errorMsg("请选择");
+      }
+    },
+    /**
+     * 根据条件禁用行复选框
+     * 函数返回值为false则禁用选择(反之亦然)
+     * @param {Object} row - 行数据
+     * @param {String} index - 索引值
+     * @return Boolean
+     */
+    selectable: function (row, index) {
+      // row.disabled == undefined 才能被选中
+      if (row.disabled == undefined) {
+        return true;
+      }
+      // 函数必须有返回值且是布尔值
+      // 页面刷新后该函数会执行 N 次进行判断(N 为表格行数)
+      // 如果没有返回值则默认返回false(全部无法选中)
+    },
+
+    // 上一步
+    handleShang() {
+      this.cusIndex -= 1;
+      this.multipleData.splice(this.cusIndex, 1);
+    },
+    // 条件数据多选
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+      console.log(this.multipleSelection);
+    },
+    hanlePopData() {
+      this.multipleData.push(this.multipleSelection);
+      if (this.multipleData.length) {
+        let arrData = [];
+        console.log(this.multipleData, "datga");
+        for (let i = 0; i < this.multipleData.length; i++) {
+          arrData = [...arrData, ...this.multipleData[i]];
+        }
+          if (this.goodsList.length) {
+            this.goodsList = [...this.goodsList,...arrData];
+          }else{
+            this.goodsList = arrData
+          }
+
+         console.log(this.goodsList,'jjjj');
+        this.goodsList.forEach((item) => {
+          this.$set(item, "status1", "");
+          this.$set(item, "status2", "");
+        });
+        this.cusIndex = 0;
+        this.total = 0;
+        this.popDataArr = [];
+        this.multipleData=[]
+        this.policyId = this.screenForm.policyId;
+        this.isShowDialog = false;
+      } else {
+        this.$errorMsg("请选择");
+      }
+    },
+    // 获取详情
+    getDetail() {
+      getDetail({ id: this.listItem.id }).then((res) => {
+        let data = res.data;
+        this.mainForm.date = data.theTime;
+        this.mainForm.type = data.mainId;
+        this.mainForm.remark = data.remark;
+        data.retailOrderItemList.forEach((item) => {
+          item.status1 = "";
+          item.status2 = "";
+        });
+        this.goodsList = data.retailOrderItemList;
+      });
+    },
+    // 获取销售政策
+    getPolicyList() {
+      policyList({
+        pageNum: 1,
+        pageSize: -1,
+      }).then((res) => {
+        this.screenForm.policyId = res.data.records[0].code;
+        this.handlePolicy(this.screenForm.policyId);
+        this.policyList = res.data.records;
+        console.log(this.policyList, "policyList");
+      });
+    },
+    // 获取销售类型
+    getTypeList() {
+      const params = {
+        pageNum: 1,
+        pageSize: -1,
+        saleCode: "",
+        saleName: "",
+        status: "",
+      };
+      typeList(params).then((res) => {
+        this.ztypeList = res.data.records;
+        console.log(this.ztypeList, "type1111");
+      });
+    },
+    // 获取仓库列表
+    getWarehouseList() {
+      getWarehouseList({
+        pageNum: 1,
+        pageSize: -1,
+      }).then((res) => {
+        this.warehouseList = res.data.records;
+      });
+    },
+    // 获取限定机型
+    getpolicyTypeList() {
+      getpolicyTypeList({
+        pageNum: 1,
+        pageSize: 10,
+        policyId: this.screenForm.policyId,
+        saleTypeCode: this.screenForm.saleTypeCode,
+      }).then((res) => {
+        for (let i = 0; i < res.data.records.length; i++) {
+          res.data.records[i].qty = 1;
+        }
+        this.dataList = res.data.records;
+        this.total = res.data.total;
+        console.log(this.dataList, "kkkk");
+      });
+    },
+    // 获取政策列表
+    getMaterialTypeList() {
+      getMaterialTypeList({
+        pageNum: 1,
+        pageSize: 10,
+        policyId: this.screenForm.policyId,
+        saleTypeCode: this.screenForm.saleTypeCode,
+      }).then((res) => {});
+    },
+
+    handleShow() {
+      this.isShowDialog = true;
+      this.getPolicyList();
+    },
+    // 获取钱包列表
+    getWalletList() {
+      getWalletList({
+        customerId: JSON.parse(localStorage.getItem("supply_user")).customerId,
+        type: "COMMONLY",
+      }).then((res) => {
+        this.xjWalletList = res.data;
+        console.log(res.data, "xxxxx");
+      });
+
+      getWalletList({
+        customerId: JSON.parse(localStorage.getItem("supply_user")).customerId,
+        type: "REBATE",
+      }).then((res) => {
+        this.flWalletList = res.data;
+        console.log(this.flWalletList, "xxccc");
+      });
+    },
+
+    // 获取销售类型列表
+    getSalesTypeList() {
+      getSalesTypeList({
+        pageNum: 1,
+        pageSize: -1,
+      }).then((res) => {
+        this.salesTypeList = res.data.records;
+      });
+    },
+
+    getDictList() {
+      getDictList({ sysDictEnum: "PRODUCT_TYPE" }).then((res) => {
+        this.typeList = res.data;
+      });
+    },
+
+    // 获取商品列表
+    getGoodsList() {
+      getGoodsList({
+        pageNum: this.currentPage,
+        pageSize: 10,
+        mainId: this.screenForm.type,
+        saleId: this.screenForm.salesType,
+        materialCode: this.screenForm.proNum,
+        materialName: this.screenForm.proName,
+        specification: this.screenForm.proModel,
+        price1: this.screenForm.price1,
+        price2: this.screenForm.price2,
+      }).then((res) => {
+        let oldGoodsList = this.goodsList;
+        let newGoodsList = res.data.records;
+        for (let i = 0; i < oldGoodsList.length; i++) {
+          let oldItem = oldGoodsList[i];
+          for (let j = 0; j < newGoodsList.length; j++) {
+            let newItem = newGoodsList[j];
+            if (newItem.materialId === oldItem.materialId) {
+              newGoodsList[j].selected = true;
+              break;
+            }
+          }
+        }
+        res.data.records.forEach((item) => {
+          item.materialName = item.name;
+          item.materialCode = item.number;
+          item.saleTypeName = item.saleName;
+          item.unit = item.baseUnit;
+          item.price = item.batchPrice;
+          item.tax = item.taxRate;
+          item.isDirectTransfer = false;
+          item.directTransferQty = "";
+          item.status1 = "";
+          item.status2 = "";
+          item.rebateAmount = "";
+          item.rebateRate = "";
+          item.productPriceId = item.id;
+        });
+        this.leftGoodsList = res.data.records;
+        this.listTotal = res.data.total;
+      });
+    },
+
+    // 查询重复值并禁选
+    checkboxSelect(row, rowIndex) {
+      if (row.selected) {
+        return false; // 禁用
+      } else {
+        return true; // 不禁用
+      }
+    },
+
+    // 点击 选择商品
+    openDialog() {
+      this.getSalesTypeList();
+      this.getGoodsList();
+      this.isShowDialog = true;
+    },
+
+    // 提交筛选表单
+    submitScreenForm() {
+      this.currentPage = 1;
+      this.getGoodsList();
+    },
+
+    // 重置筛选表单
+    resetScreenForm() {
+      this.$refs.screenForm.resetFields();
+      this.currentPage = 1;
+      this.getGoodsList();
+    },
+
+
+
+    // 关闭 弹窗
+    closeDialog() {
+      this.isShowDialog = false;
+    },
+
+    // 删除
+    deleteGoods() {
+      let rightGoodsList = this.rightGoodsList;
+      let rightSelection = this.rightSelection;
+      for (let i = 0; i < rightGoodsList.length; i++) {
+        for (let j = 0; j < rightSelection.length; j++) {
+          if (rightSelection[j].materialId == rightGoodsList[i].materialId) {
+            this.rightGoodsList.splice(i, 1);
+          }
+        }
+      }
+    },
+
+    // 确定 添加产品
+    submitAddGoods() {
+      if (this.radio) {
+        const params = this.radio.split("&");
+        this.screenForm.policyId = params[1];
+        this.mainForm.policyId = params[1];
+        this.cusIndex += 1;
+        getpolicyList({
+          materialId: params[2],
+          policyId: params[1],
+        }).then((res) => {
+          this.pop = res.data.pop;
+          this.popArr = res.data.pop.split(":");
+          this.popArr.splice(0, 1);
+          for (let i = 0; i < this.popArr.length; i++) {
+            this.$set(this.radioObj, "radio" + (i + 1), "");
+          }
+          this.step = this.cusIndex + 1;
+
+          this.getConditionList(params[3], this.step);
+        });
+      } else {
+        this.$errorMsg("请选择");
+      }
+    },
+    // 更改每页数量
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.currentPage = 1;
+      this.getConditionList(this.policyConditionId, this.cusIndex + 1);
+    },
+    // 更改当前页
+    handleCurrentChange(val) {
+      this.currentPage = val;
+
+      this.getConditionList(this.policyConditionId, this.cusIndex + 1);
+    },
+ // 更改列表当前页
+    handleTableCurrentChange(val) {
+      this.currentPage = val;
+      this.getConditionList(this.policyConditionId, this.cusIndex + 1);
+    },
+    handleClose() {
+      this.cusIndex = 0;
+      this.radio = "";
+      this.dataList = [];
+      this.popDataArr = [];
+      this.screenForm.policyId = "";
+      this.screenForm.saleTypeCode = "";
+    },
+    // 删除产品
+    deleteItem(index) {
+      this.goodsList.splice(index, 1);
+      console.log(this.multipleData);
+      // this.popDataArr.splice(index,1)
+    },
+    // 修改返利钱包
+    changeWallet(index) {
+      if (this.goodsList[index].customerWalletId2) {
+        let obj = this.flWalletList.find(
+          (o) => o.customerWalletId == this.goodsList[index].customerWalletId2
+        );
+        this.goodsList[index].rebateRate = obj.rebateRate;
+      } else {
+        this.goodsList[index].rebateRate = "";
+      }
+    },
+
+    // 检查库存
+    checkStock() {
+      if (!this.warehouseValue) {
+        return this.$errorMsg("请选择仓库");
+      }
+      if (!this.goodsList) {
+        return this.$errorMsg("请添加货品");
+      }
+      let ids = [];
+      this.goodsList.forEach((item) => {
+        ids.push(item.materialId);
+      });
+      checkStock({
+        correspondId: this.warehouseValue,
+        materialId: ids.join(","),
+      }).then((res) => {
+        if (res.data) {
+          this.goodsList.forEach((item, index) => {
+            item.status1 = res.data[index].allStockNum;
+            item.status2 = res.data[index].stockNum;
+            console.log(item.status1, item.status2);
+          });
+        }
+      });
+    },
+    status2Filter(item) {
+      if (
+        item.status2 === "" ||
+        item.status2 === null ||
+        item.status2 === undefined
+      )
+        return "未检查";
+      else if (item.status2 >= item.qty) return "可用";
+      else return "短缺";
+    },
+    // 保存
+    clickSubmitForm() {
+      this.$refs.mainForm.validate((valid) => {
+        if (valid) {
+          let mainName =
+            this.typeList[
+              findElem(this.typeList, "dictCode", this.mainForm.type)
+            ].dictValue;
+          let params = {
+            theTime: this.mainForm.date + " 00:00:00",
+            mainId: this.mainForm.type,
+            mainName,
+            remark: this.mainForm.remark,
+            type: 2, // 1:普通零售单，2:政策零售单
+            retailOrderItemList: this.goodsList,
+            policyId: this.policyId,
+          };
+          if (this.listItem) {
+            params.id = this.listItem.id;
+            editData(params).then((res) => {
+              this.$successMsg("编辑成功");
+              this.goBack();
+              this.$parent.getList();
+            });
+          } else {
+            addData(params).then((res) => {
+              this.$successMsg("添加成功");
+              this.goBack();
+              this.$parent.getList();
+            });
+          }
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.fr {
+  margin: 10px;
+  overflow: hidden;
+}
+.detail-container {
+  width: 100%;
+  height: 100%;
+}
+.main-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 20px;
+  height: 60px;
+  border-bottom: 1px solid #dcdfe6;
+  margin-bottom: 20px;
+  .title {
+    font-size: 16px;
+    font-weight: 600;
+    padding-left: 10px;
+  }
+}
+.tables {
+  display: flex;
+  margin-top: 10px;
+  .table {
+    width: 45%;
+  }
+  .buttons {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    padding: 0 10px;
+    button {
+      margin: 0;
+      margin-top: 10px;
+    }
+  }
+}
+.ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+</style>

src/views/supply/policy/policy_list.vue

@@ -238,7 +238,7 @@
             <el-table-column
               align="center"
               label="金额"
-              prop="totalAmount"
+              prop="payAmount"
               min-width="100"
               show-overflow-tooltip
             ></el-table-column>
@@ -262,8 +262,15 @@
 
             <el-table-column
               align="center"
-              label="返利"
-              prop="rebateAmount"
+              label="返利金额"
+              prop="payRebateAmount"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="格力折扣"
+              prop="totalDiscAmount"
               min-width="100"
               show-overflow-tooltip
             ></el-table-column>
@@ -427,7 +434,7 @@ import {
   submitCancel,
 } from "@/api/supply/policy";
 import RetailDetail from "./components/retail_detail";
-import RetailForm from "./components/retail_form";
+import RetailForm from "./components/retail_form2";
 import RetailExamine from "./components/retail_examine";
 import RetailReturn from "./components/retail_return";
 
@@ -525,6 +532,7 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : "",
         endTime: this.screenForm.date ? this.screenForm.date[1] : "",
         createBy: this.screenForm.zbMan,
+        status: true,
         examineBy: this.screenForm.shMan,
         type: 2, // 1:普通零售单，2:政策零售单
       };