Merge branch 'feature/Feature-sales' into develop

src/views/engin_deposit/components/deposit-apply-surrender.vue

@@ -55,11 +55,8 @@
               </el-form-item>
             </div>
           </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
-            <div class="label"></div>
-            <div class="value"></div>
-          </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
+
+          <el-col :xs="24" :sm="24" :lg="16" class="item">
             <div class="label">移动电话</div>
             <div class="value">{{ details.refPhone }}</div>
           </el-col>
@@ -79,7 +76,7 @@
             <div class="label"></div>
             <div class="value"></div>
           </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <el-col :xs="24" :sm="24" :lg="24" class="item">
             <div class="label">安装时间</div>
             <div class="value" style="padding: 0">
               <el-form-item prop="installDate">
@@ -94,7 +91,7 @@
               </el-form-item>
             </div>
           </el-col>
-          <el-col :xs="24" :sm="24" :lg="8" class="item">
+          <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
             <div class="label">寄厂日期</div>
             <div class="value" style="padding: 0">
               <el-form-item prop="sendFactoryDate">
@@ -108,7 +105,7 @@
                 </el-date-picker>
               </el-form-item>
             </div>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
     </div>
@@ -227,6 +224,7 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="申请人" prop="submitBy">
               <el-input
+              readonly
                 v-model="details.submitBy"
                 placeholder="请输入"
               ></el-input>
@@ -235,6 +233,7 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="申请日期" prop="submitTime">
               <el-date-picker
+              readonly
                 v-model="details.submitTime"
                 class="dateStyle"
                 type="datetime"
@@ -298,7 +297,10 @@ export default {
       this.$parent.showPage = 1;
     },
     handleSvse() {
-      console.log();
+        if (!this.details.installDate) {
+            this.$errorMsg('请选择安装时间')
+            return
+        }
         this.fileList.forEach(el => {
             this.details.dataList.push({
               dataDescribe:el.name,

src/views/engin_deposit/components/deposit_list-detail.vue

@@ -8,6 +8,7 @@
       <el-radio-button label="工程押金信息"></el-radio-button>
       <el-radio-button label="工程订单信息"></el-radio-button>
       <el-radio-button label="工程发货信息"></el-radio-button>
+      <el-radio-button label="直调发货"></el-radio-button>
     </el-radio-group>
     <br /><br />
 
@@ -27,7 +28,7 @@
               <div class="label">工程编号</div>
               <div class="value">{{ details.refProjectNo }}</div>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <el-col :xs="24" :sm="24" :lg="16" class="item">
               <div class="label">经销商名称</div>
               <div class="value">{{ details.customerName }}</div>
             </el-col>
@@ -49,7 +50,7 @@
               <div class="value">{{ details.refTel }}</div>
             </el-col>
 
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
+            <el-col :xs="24" :sm="24" :lg="16" class="item">
               <div class="label">厂工程编码</div>
               <div class="value">
                 <el-form-item prop="refFactoryNo">
@@ -61,10 +62,7 @@
                 </el-form-item>
               </div>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label"></div>
-              <div class="value"></div>
-            </el-col>
+
             <el-col :xs="24" :sm="24" :lg="8" class="item">
               <div class="label">移动电话</div>
               <div class="value">{{ details.refPhone }}</div>
@@ -81,11 +79,8 @@
               <div class="label">使用单位</div>
               <div class="value">{{ details.refUseUnit }}</div>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label"></div>
-              <div class="value"></div>
-            </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
+
+            <el-col :xs="24" :sm="24" :lg="16" class="item">
               <div class="label">安装时间</div>
               <div class="value" style="padding: 0">
                 <el-form-item prop="installDate">
@@ -241,20 +236,28 @@
             <div class="value">{{ details.checkDate }}</div>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="12" class="item">
-            <div class="label" >是否退押</div>
+            <div class="label">是否退押</div>
             <div class="value">
-              <template v-if="!(details.examineStatus =='WAIT' || details.examineStatus == 'SAVE'  || details.examineStatus =='CLOSE')">
+              <template
+                v-if="
+                  !(
+                    details.examineStatus == 'WAIT' ||
+                    details.examineStatus == 'SAVE' ||
+                    details.examineStatus == 'CLOSE'
+                  )
+                "
+              >
                 {{ details.isRefundDeposit == true ? "是" : "否" }}
-                </template>
+              </template>
             </div>
-
           </el-col>
           <el-col :xs="12" :sm="12" :lg="12" class="item">
             <div class="label">审批结果</div>
-            <div class="value" v-if="details.examineStatus =='Ok'">
-              通过
-            </div>
-            <div class="value" v-if="details.confirmName && details.examineStatus =='SAVE'">
+            <div class="value" v-if="details.examineStatus == 'Ok'">通过</div>
+            <div
+              class="value"
+              v-if="details.confirmName && details.examineStatus == 'SAVE'"
+            >
               驳回
             </div>
           </el-col>
@@ -416,67 +419,7 @@
         </div>
       </div>
     </div>
-    <div v-show="">
-
-      <el-form
-        ref="deliverForm"
-        :model="deliverForm"
-        :rules="deliverFormRules"
-        label-width="80px"
-        size="small"
-        label-position="left"
-      >
-        <el-row :gutter="20">
-          <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="选择日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="8" :sm="8" :lg="8">
-            <el-form-item label="发货仓库" prop="warehouse">
-              <el-select
-                v-model="deliverForm.warehouse"
-                placeholder="请选择发货仓库"
-                style="width: 100%"
-                filterable
-                @change="changeWarehouse"
-              >
-                <el-option
-                  v-for="item in warehouseList"
-                  :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>
-        </el-row>
-      </el-form>
-
+    <div v-show="engineering == '直调发货'" class="zd">
       <div class="table" style="margin-top: 20px">
         <el-table
           :data="goodsList"
@@ -485,7 +428,6 @@
           fit
           highlight-current-row
           stripe
-          max-height="400"
         >
           <el-table-column
             align="center"
@@ -493,31 +435,39 @@
             type="index"
             width="50"
           ></el-table-column>
+
           <el-table-column
             align="center"
-            label="销售类型"
-            prop="saleTypeName"
-            min-width="100"
+            label="产品名称"
+            prop="materialName"
+            min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="产品编码"
-            prop="materialCode"
+            label="规格型号"
+            prop="specification"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="产品名称"
-            prop="materialName"
-            min-width="160"
+            label="订单号"
+            prop="orderNo"
+            min-width="200"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="规格型号"
-            prop="specification"
+            label="发货单号"
+            prop="deliverNo"
+            min-width="200"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="发货日期"
+            prop="deliverDate"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -528,57 +478,91 @@
             min-width="100"
             show-overflow-tooltip
           ></el-table-column>
+
           <el-table-column
             align="center"
-            label="订单数量"
-            prop="refundableQty"
+            label="直调数量"
+            prop="qty"
             min-width="100"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+          </el-table-column>
           <el-table-column
             align="center"
-            label="发货数量"
-            prop="hasSendQty"
+            label="单价"
+            prop="price"
             min-width="100"
             show-overflow-tooltip
           ></el-table-column>
+
           <el-table-column
             align="center"
-            label="直调数量"
-            prop="adjustNum"
+            label="订单类型"
+            prop="orderType"
             min-width="100"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.adjustNum"
-                size="small"
-                type="number"
-                :disabled="!scope.row.isDirectTransfer"
-              ></el-input>
+              {{ orderType[scope.row.orderType] }}
             </template>
           </el-table-column>
           <el-table-column
             align="center"
-            label="单价"
-            prop="price"
+            label="仓库名称"
+            prop="correspondName"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="价税合计"
+            prop="mustTotalAmount"
             min-width="100"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="金额"
-            prop="totalAmount"
+            label="无税单价"
+            prop="afterTaxPrice"
             min-width="100"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="返利"
-            prop="payRebateAmount"
+            label="无税金额"
+            prop="noTaxTotalAmount"
             min-width="100"
             show-overflow-tooltip
           ></el-table-column>
+          <el-table-column
+            align="center"
+            label="押金金额"
+            prop="singleDepositAmount"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="总押金金额"
+            prop="totalDepositAmount"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="制表人"
+            prop="createBy"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+
+          <el-table-column
+            align="center"
+            label="制表日期"
+            prop="createTime"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
 
           <el-table-column
             align="center"
@@ -589,11 +573,6 @@
           ></el-table-column>
         </el-table>
       </div>
-      <span slot="footer" class="dialog-footer">
-        <!-- <el-button @click="closeDeliverDialog">取 消</el-button> -->
-        <!-- <el-button type="primary" @click="submitDeliverForm">确 定</el-button> -->
-      </span>
-
     </div>
   </div>
 </template>
@@ -605,6 +584,8 @@ import {
   editInfo,
   getListProject,
 } from "@/api/engin_deposit.js";
+import { getList } from "@/api/supply/adjust";
+
 export default {
   data() {
     return {
@@ -613,7 +594,10 @@ export default {
       dataList: [],
       projectList: [],
       details: {},
-      goodsList:[],
+      goodsList: [],
+      warehouseList: [],
+      positionList: [],
+
       deliverForm: {
         date: "",
         warehouse: "",
@@ -630,6 +614,12 @@ export default {
           { required: true, message: "请选择仓位", trigger: "change" },
         ],
       },
+      orderType: {
+        TRADE: "商用",
+        HOME: "家用",
+        RETAIL: "零售单",
+        RETAIL_POLICY: "销售政策单",
+      },
     };
   },
   created() {
@@ -642,17 +632,26 @@ export default {
           this.details = res.data;
         });
       } else if (this.engineering == "工程订单信息") {
-        geOrderInfo({ refEnginRecordNo: this.$parent.refEnginRecordNo,examineStatus:'OK' }).then(
-          (res) => {
-            this.dataList = res.data;
-          }
-        );
+        geOrderInfo({
+          refEnginRecordNo: this.$parent.refEnginRecordNo,
+          examineStatus: "OK",
+        }).then((res) => {
+          this.dataList = res.data;
+        });
+      } else if (this.engineering == "直调发货") {
+        getList({
+          pageSize: -1,
+          pageNum: 1,
+          enginRecordNo: this.$parent.refEnginRecordNo,
+        }).then((res) => {
+          this.goodsList = res.data.records;
+        });
       } else {
         getListProject({
           pageSize: -1,
           pageNum: 1,
           refEnginRecordNo: this.$parent.refEnginRecordNo,
-          examineStatus:'OK'
+          examineStatus: "OK",
         }).then((res) => {
           this.projectList = res.data.records;
         });
@@ -675,7 +674,6 @@ export default {
     handleReset() {
       this.$refs.form.resetFields();
     },
-
   },
 };
 </script>
@@ -697,6 +695,13 @@ export default {
     margin: 0;
   }
 }
+.zd {
+  ::v-deep .el-input__suffix {
+    right: 0;
+    -webkit-transition: all 0.3s;
+    transition: all 0.3s;
+  }
+}
 ::v-deep .el-input__suffix {
   right: -15px;
   -webkit-transition: all 0.3s;

src/views/engin_deposit/deposit_list.vue

@@ -165,13 +165,13 @@
                 <el-tag type="warning" size="small" v-else>否</el-tag>
               </template>
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               align="center"
               label="押金比例"
               prop=""
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               align="center"
               label="押金金额"

src/views/sales_policy/components/AddPolicy.vue

@@ -499,6 +499,7 @@ export default {
   },
   created() {
     this.getCommonApi();
+
     // console.log(this.$store.code);
 
     if (this.$parent.isFlag) {
@@ -522,6 +523,29 @@ export default {
       });
     },
     getCommonApi() {
+      getK3List({
+         pageNum: 1,
+        pageSize:10,
+        keyword: '',
+      }).then((res) => {
+        this.k3List = res.data.records
+      });
+      // 非返利钱包
+      getNoRebateWalletList({ walletName: "" }).then((res) => {
+        this.NoRebateWalletList = res.data;
+        console.log(this.NoRebateWalletList,'kkkk');
+      });
+       const params = {
+        pageNum: 1,
+        pageSize: -1,
+        saleCode: "",
+        saleName: "",
+        status: "",
+      };
+      // 获取销售类型列表
+      getTypeList(params).then((res) => {
+        this.typeList = res.data.records;
+      });
       // this.handletwoList()
       // const params = {
       //   pageNum: 1,
@@ -600,6 +624,8 @@ export default {
         this.$alert(result.message, "导入成功", {
           confirmButtonText: "确定",
         });
+         this.dataList = [];
+          this.listTotal = 0;
         this.handletwoList();
       } else {
         this.$alert(result.message, "导入失败", {
@@ -626,8 +652,9 @@ export default {
         .then((result) => {
           result.data.records.forEach(k=>{
             k.walletIds = []
-            k.materialNumber = k.materialId
-            k.specification =  k.materialId
+            k.materialNumber = k.materialNumber
+            k.specification =  k.specification
+            k.materialId = k.materialId
               k.walletRelaList.forEach(l=>{
               l.id = l.walletId
               l.name = l.walletName
@@ -721,28 +748,6 @@ export default {
     },
     handleNewInfo() {
         // 物料列表
-      getK3List({
-         pageNum: 1,
-        pageSize:10,
-        keyword: '',
-      }).then((res) => {
-        this.k3List = res.data.records
-      });
-      // 非返利钱包
-      getNoRebateWalletList({ walletName: "" }).then((res) => {
-        this.NoRebateWalletList = res.data;
-      });
-       const params = {
-        pageNum: 1,
-        pageSize: -1,
-        saleCode: "",
-        saleName: "",
-        status: "",
-      };
-      // 获取销售类型列表
-      getTypeList(params).then((res) => {
-        this.typeList = res.data.records;
-      });
       this.dataList.push({
         id:'',
         discAmount: "",
@@ -759,6 +764,7 @@ export default {
         walletIds: "",
         walletRelaList: [],
       });
+      this.listTotal +=1
       // this.dataList.push(this.addList[this.addList.length-1])
     },
     handleSave(){