Merge branch 'feature/Feature-sticky' into develop

src/api/common.js

@@ -44,9 +44,9 @@ export function getTypeList(params) {
 }
 // 销售类型-家用工程专用
 export function getHomeTypeList(params) {
-  // /sale/type/home/list
+  ///sale/type/home/list
   return request({
-    url: '/sale/type/list',
+    url: '/sale/type/home/list',
     method: 'get',
     params
   })

src/views/finance/components/rebate_list-confirm.vue

@@ -88,7 +88,13 @@
           </el-table-column>
           <el-table-column align="right" label="返利金额" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input class="mountclass" :disabled="show" type="number" v-model="scope.row.rebateAmount"></el-input>
+              <el-input
+                style="width: 100%"
+                class="mountclass"
+                :disabled="show"
+                type="number"
+                v-model="scope.row.rebateAmount"
+              ></el-input>
             </template>
           </el-table-column>
           <!--          <el-table-column align="right" label="折让金额" prop="" min-width="160" show-overflow-tooltip>-->
@@ -225,9 +231,7 @@ export default {
           itemId: v.id
         }
       })
-      console.log(774)
-      return
-      // console.log(res, 888);
+
       if (this.state == 1) {
         await getRebateOrderAclUpdate(res)
         this.$message.success('编辑成功')
@@ -267,6 +271,7 @@ export default {
 ::v-deep .mountclass {
   input {
     text-align: right;
+    width: 100%;
   }
 }
 </style>

src/views/supply/engin/components/home_form.vue

@@ -970,7 +970,7 @@ export default {
 
     // 获取家用销售类型列表
     getHomeTypeList() {
-      getHomeTypeList({ pageNum: 1, pageSize: -1 }).then(res => {
+      getHomeTypeList().then(res => {
         this.salesTypeList = res.data.records
       })
     },

src/views/supply/implement/implement_total_list.vue

@@ -73,8 +73,22 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+
+                <el-form-item label="制单日期" prop="date">
+                  <el-date-picker
+                    v-model="screenForm.date"
+                    type="datetimerange"
+                    range-separator="至"
+                    style="width: 100%"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+                </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="下单日期" prop="date">
+                  <el-form-item label="订单日期" prop="orderDate">
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
@@ -171,7 +185,7 @@
             </el-table-column>
             <el-table-column
               align="left"
-              label="下单日期"
+              label="制单日期"
               prop="createTime"
               min-width="160"
               show-overflow-tooltip
@@ -461,6 +475,7 @@ export default {
         policyCode: '',
         policyRemark: '',
         isOver: '',
+        orderDate:'',
         walletIds1: []
       },
       categoryList: [],
@@ -488,6 +503,8 @@ export default {
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        orderStartTime: this.screenForm.orderDate ? this.screenForm.orderDate[0] : '',
+        orderEndTime: this.screenForm.orderDate ? this.screenForm.orderDate[1] : '',
         serviceName: this.screenForm.serviceName,
         newServiceName: this.screenForm.newServiceName,
         itemServiceName: this.screenForm.itemServiceName,
@@ -526,6 +543,8 @@ export default {
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        orderStartTime: this.screenForm.orderDate ? this.screenForm.orderDate[0] : '',
+        orderEndTime: this.screenForm.orderDate ? this.screenForm.orderDate[1] : '',
         serviceName: this.screenForm.serviceName,
         newServiceName: this.screenForm.newServiceName,
         itemServiceName: this.screenForm.itemServiceName,

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

@@ -327,17 +327,17 @@
             备注：{{ factor[0].remark }}
           </el-row>
           <el-row :gutter="20">
-            <el-col :xs="24" :sm="8" :lg="11">
+            <el-col :xs="24" :sm="12" :lg="12">
               <el-form-item label="规格型号">
                 <div style="display: flex">
-                  <el-input v-model="screenForm.specification" placeholder="请输入型号规格型号" />
+                  <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
                   <el-button style="margin-left: 10px" type="primary" size="mini" @click="handleGetPolicyList"
                     >查询</el-button
                   >
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="11">
+            <el-col :xs="24" :sm="12" :lg="12">
               <el-form-item label="销售政策" class="myselect">
                 <el-select
                   v-model="screenForm.policyId"
@@ -356,14 +356,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="8" :lg="11">
+            <el-col :xs="24" :sm="12" :lg="12">
               <el-form-item label="规格型号">
                 <div style="display: flex">
                   <el-input v-model="screenForm.specifications" placeholder="请输入型号规格型号" />
                 </div>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="11">
+            <el-col :xs="24" :sm="12" :lg="12">
               <el-form-item label="销售类型">
                 <el-select
                   v-model="screenForm.saleTypeCode"
@@ -376,8 +376,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-
-            <el-col :xs="22" :sm="22" :lg="22" class="tr">
+            <el-col :xs="24" :sm="12" :lg="12">
+              <el-form-item label="价格类型">
+                <div style="display: flex">
+                  <el-input v-model="screenForm.priceType" placeholder="请输入价格类型" />
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="22" :sm="22" :lg="12" class="tr">
               <!-- <el-button
                 type="primary"
                 size="small"
@@ -450,7 +456,7 @@
                   show-overflow-tooltip
                 >
                   <template slot-scope="scope">
-                    <template v-if="col.lable == '产品名称' || col.lable == '规格型号'">
+                    <template v-if="col.lable == '产品名称' || col.lable == '规格型号' || col.lable == '价格类型'">
                       <CopyButton :copy-text="scope.row[col.prop]" />
                       <span> {{ scope.row[col.prop] }}</span>
                     </template>
@@ -467,6 +473,7 @@
                     <el-col />
                     <el-col />
                     <el-col />
+                    <el-col />
                     <el-col>{{ totalArr[index].totalQty }}</el-col>
                     <el-col>{{ totalArr[index].totalPrice | numToFixed }}</el-col>
                     <el-col>{{ totalArr[index].totalAmount | numToFixed }}</el-col>
@@ -557,7 +564,7 @@
                 show-overflow-tooltip
               >
                 <template slot-scope="scope">
-                  <template v-if="col.lable == '产品名称' || col.lable == '规格型号'">
+                  <template v-if="col.lable == '产品名称' || col.lable == '规格型号' || col.lable == '价格类型'">
                     <CopyButton :copy-text="scope.row[col.prop]" />
                     <span> {{ scope.row[col.prop] }}</span>
                   </template>
@@ -574,6 +581,7 @@
                   <el-col />
                   <el-col />
                   <el-col />
+                  <el-col />
                   <el-col>{{ totalQty }}</el-col>
                   <el-col>{{ totalPrice | numToFixed }}</el-col>
                   <el-col>{{ totalAmount | numToFixed }}</el-col>
@@ -675,6 +683,7 @@ export default {
         saleTypeCode: '',
         factorId: '',
         specification: '',
+        priceType: '',
         specifications: ''
       },
 
@@ -708,6 +717,12 @@ export default {
           widht: 350,
           align: 'left'
         },
+        {
+          prop: 'priceType',
+          lable: '价格类型',
+          widht: 200,
+          align: 'left'
+        },
 
         {
           prop: 'qty',
@@ -1057,6 +1072,7 @@ export default {
         policyConditionId,
         popType,
         status: true,
+        priceType: this.screenForm.priceType,
         specification: this.screenForm.specifications,
         saleTypeCode: this.screenForm.saleTypeCode,
         customerId: JSON.parse(localStorage.getItem('supply_user')).customerId
@@ -1127,6 +1143,7 @@ export default {
         pageSize: -1,
         policyId: this.screenForm.policyId,
         saleTypeCode: this.screenForm.saleTypeCode,
+        priceType: this.screenForm.priceType,
         specification: this.screenForm.specifications,
         status: true,
         customerId: JSON.parse(localStorage.getItem('supply_user')).customerId,