Merge branch 'hotfix/Hotfix-zh-309' into develop

# Conflicts:
#	src/views/supply/engin/commerce_list.vue
#	src/views/supply/engin/home_list.vue
#	src/views/supply/policy/policy_list.vue
#	src/views/supply/retail/retail_list.vue

src/views/supply/engin/commerce_list.vue

@@ -52,18 +52,7 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="销售类型" prop="saleType">
-                    <el-select v-model="screenForm.saleType" placeholder="选择销售类型" style="width: 100%" clearable>
-                      <el-option
-                        v-for="item in salesTypeList"
-                        :key="item.id"
-                        :label="item.saleName"
-                        :value="item.id"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="经销商" prop="dealer">
                     <el-input v-model="screenForm.dealer" placeholder="请输入经销商"></el-input>
@@ -112,6 +101,34 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="钱包" prop="customerWalletId">
+                    <el-select
+                      v-model="screenForm.customerWalletId"
+                      placeholder="选择钱包"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option v-for="item in NoRebateWalletList" :key="item.id" :label="item.name" :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="销售类型" prop="saleTypeId">
+                    <el-select
+                      v-model="screenForm.saleTypeId"
+                      placeholder="选择销售类型"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option v-for="item in typeList" :key="item.id" :label="item.saleName" :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </template>
@@ -546,7 +563,9 @@ export default {
         salesMan: '',
         dealer: '',
         model: '',
-        isDirectTransfer: null
+        isDirectTransfer: null,
+        saleTypeId: '',
+        customerWalletId: ''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -630,6 +649,7 @@ export default {
       }).then(res => {
         console.log(res)
         this.NoRebateWalletList = res.data
+        console.log(this.NoRebateWalletList)
       })
       getTypeList({ pageNum: 1, pageSize: -1 }).then(res => {
         this.typeList = res.data.records
@@ -664,6 +684,7 @@ export default {
         saleTypeId: this.screenForm.saleType,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
+        customerWalletId: this.screenForm.customerWalletId,
         serviceId: this.screenForm.salesMan,
         customerKeyword: this.screenForm.dealer,
         isDirectTransfer: this.screenForm.isDirectTransfer,

src/views/supply/engin/home_list.vue

@@ -170,6 +170,34 @@
                     />
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="钱包" prop="customerWalletId">
+                    <el-select
+                      v-model="screenForm.customerWalletId"
+                      placeholder="选择钱包"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option v-for="item in NoRebateWalletList" :key="item.id" :label="item.name" :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="销售类型" prop="saleTypeId">
+                    <el-select
+                      v-model="screenForm.saleTypeId"
+                      placeholder="选择销售类型"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option v-for="item in typeList" :key="item.id" :label="item.saleName" :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </template>
@@ -628,7 +656,9 @@ export default {
         refBuyUnitName: '',
         refPromiseProvide: '',
         isDirectTransfer: null,
-        orderTime: []
+        orderTime: [],
+        saleTypeId: '',
+        customerWalletId: ''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -727,6 +757,7 @@ export default {
       }).then(res => {
         console.log(res)
         this.NoRebateWalletList = res.data
+        console.log(this.NoRebateWalletList)
       })
       getTypeList({ pageNum: 1, pageSize: -1 }).then(res => {
         this.typeList = res.data.records
@@ -770,6 +801,8 @@ export default {
         refRegionWork: this.screenForm.refRegionWork,
         remark: this.screenForm.remark,
         geLiInerNote: this.screenForm.geLiInerNote,
+        saleTypeId: this.screenForm.saleTypeId,
+        customerWalletId: this.screenForm.customerWalletId,
         refFactoryNo: this.screenForm.refFactoryNo,
         refBuyUnitName: this.screenForm.refBuyUnitName,
         isDirectTransfer: this.screenForm.isDirectTransfer,

src/views/supply/policy/policy_list.vue

@@ -141,6 +141,34 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="钱包" prop="customerWalletId">
+                    <el-select
+                      v-model="screenForm.customerWalletId"
+                      placeholder="选择钱包"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option v-for="item in NoRebateWalletList" :key="item.id" :label="item.name" :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="销售类型" prop="saleTypeId">
+                    <el-select
+                      v-model="screenForm.saleTypeId"
+                      placeholder="选择销售类型"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option v-for="item in typeList" :key="item.id" :label="item.saleName" :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </template>
@@ -539,7 +567,9 @@ export default {
         specification: '',
         k3ServiceId: '',
         serviceId: '',
-        categoryNumber: ''
+        categoryNumber: '',
+        saleTypeId: '',
+        customerWalletId: ''
       },
       transfer: [
         { label: '是', value: true },
@@ -635,6 +665,7 @@ export default {
       }).then(res => {
         console.log(res)
         this.NoRebateWalletList = res.data
+        console.log(this.NoRebateWalletList)
       })
       getTypeList({ pageNum: 1, pageSize: -1 }).then(res => {
         this.typeList = res.data.records
@@ -716,6 +747,8 @@ export default {
         isDirectTransfer: this.screenForm.isDirectTransfer,
         specification: this.screenForm.specification,
         k3CategoryNumber: this.screenForm.categoryNumber,
+        saleTypeId: this.screenForm.saleTypeId,
+        customerWalletId: this.screenForm.customerWalletId,
         type: 2 // 1:普通零售单，2:政策零售单
       }
       getList(params).then(res => {

src/views/supply/retail/retail_list.vue

@@ -124,6 +124,34 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="钱包" prop="customerWalletId">
+                    <el-select
+                      v-model="screenForm.customerWalletId"
+                      placeholder="选择钱包"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option v-for="item in NoRebateWalletList" :key="item.id" :label="item.name" :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="销售类型" prop="saleTypeId">
+                    <el-select
+                      v-model="screenForm.saleTypeId"
+                      placeholder="选择销售类型"
+                      clearable
+                      filterable
+                      style="width: 100%"
+                    >
+                      <el-option v-for="item in typeList" :key="item.id" :label="item.saleName" :value="item.id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </template>
@@ -570,7 +598,9 @@ export default {
         salesMan: '',
         status: '',
         k3ServiceId: '',
-        serviceId: ''
+        serviceId: '',
+        saleTypeId: '',
+        customerWalletId: ''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -641,6 +671,7 @@ export default {
       }).then(res => {
         console.log(res)
         this.NoRebateWalletList = res.data
+        console.log(this.NoRebateWalletList)
       })
       getTypeList({ pageNum: 1, pageSize: -1 }).then(res => {
         this.typeList = res.data.records
@@ -667,6 +698,8 @@ export default {
         isDirectTransfer: this.screenForm.isDirectTransfer,
         k3ServiceId: this.screenForm.k3ServiceId,
         serviceId: this.screenForm.serviceId,
+        saleTypeId: this.screenForm.saleTypeId,
+        customerWalletId: this.screenForm.customerWalletId,
         type: 1 // 1:普通零售单，2:政策零售单
       }
       getList(params).then(res => {

src/views/supply/sales/components/sales_examine.vue

@@ -281,7 +281,8 @@ export default {
           let params = {
             id: this.listItem.id,
             approvalRemark: this.examineForm.remark,
-            examineStatus: val
+            examineStatus: val,
+            remark: this.detailData.remark
           }
           this.formLoading = true
           examineData(params)