Pārlūkot izejas kodu

Merge branch 'develop_fencang' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_fencang

lilei 2 gadi atpakaļ
vecāks
revīzija
3e74dda192

+ 1 - 1
src/config/router.config.js

@@ -165,7 +165,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'add/:sn',
+                path: 'add/:sn/:wSn',
                 name: 'salesAdd',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/edit.vue'),
                 meta: {

+ 6 - 4
src/views/dealerManagement/businessOwnerSettings/addModal.vue

@@ -49,7 +49,7 @@
           </a-radio-group>
         </a-form-model-item>
         <!-- 人员类型为仓库管理员时 显示管辖仓库 -->
-        <a-form-model-item label="管辖仓库" prop="bizUserScopeList" v-show="form.bizUserType == 'cg'">
+        <a-form-model-item label="管辖仓库" prop="bizUserScopeList" v-if="form.bizUserType == 'cg'">
           <chooseWarehouse ref="warehouse" modeType="multiple" :value="warehouseList" @change="handleWarehouse"></chooseWarehouse>
         </a-form-model-item>
         <div style="display: flex;justify-content: center;padding: 30px 0;">
@@ -138,13 +138,14 @@ export default {
       this.form.bizUserScopeList = arr
     },
     resetSearchForm () {
-      this.$refs.userName.resetForm()
       this.user_name = ''
-      this.$refs.ruleForm.resetFields()
-      if (this.form.bizUserType == 'cg') {
+      if (this.form.bizUserType && this.form.bizUserType == 'cg') {
         this.$refs.warehouse.clearData()
+
         this.form.bizUserScopeList = []
       }
+      this.$refs.userName.resetForm()
+      this.$refs.ruleForm.resetFields()
     },
     userChange (val) {
       this.form.userSn = val.key
@@ -180,6 +181,7 @@ export default {
     //  重定义的弹框状态
     isShow (newValue, oldValue) {
       if (!newValue) {
+        console.log('2222222222222222222')
         this.resetSearchForm()
         this.$emit('close')
       }

+ 1 - 1
src/views/dealerManagement/merchantInfoManagement/edit.vue

@@ -119,7 +119,7 @@
                 </a-col>
                 <a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
                   <a-form-model-item label="默认仓库" prop="defaultWarehouseSn" >
-                    <chooseWarehouse ref="warehouse" :value="form.defaultWarehouseSn" @change="handleWarehouse"></chooseWarehouse>
+                    <chooseWarehouse ref="warehouse" v-model="form.defaultWarehouseSn"></chooseWarehouse>
                   </a-form-model-item>
                 </a-col>
               </a-row>

+ 5 - 5
src/views/salesManagement/salesQuery/list.vue

@@ -128,10 +128,10 @@
               </div>
               <div v-if="$hasPermissions('M_salesQueryList_salesPrice')">
                 总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
-                已下推金额::<strong>{{ totalData&&(totalData.totalPushedAmount || totalData.totalPushedAmount==0) ? toThousands(totalData.totalPushedAmount) : '--' }}</strong>;
-                已取消金额::<strong>{{ totalData&&(totalData.totalCancelAmount || totalData.totalCancelAmount==0) ? toThousands(totalData.totalCancelAmount) : '--' }}</strong>;
-                待下推金额::<strong>{{ totalData&&(totalData.totalUnpushedAmount || totalData.totalUnpushedAmount==0) ? toThousands(totalData.totalUnpushedAmount) : '--' }}</strong>;
-                已发货金额::<strong>{{ totalData&&(totalData.totalDispatchAmount || totalData.totalDispatchAmount==0) ? toThousands(totalData.totalDispatchAmount) : '--' }}</strong>;
+                已下推金额:<strong>{{ totalData&&(totalData.totalPushedAmount || totalData.totalPushedAmount==0) ? toThousands(totalData.totalPushedAmount) : '--' }}</strong>;
+                已取消金额:<strong>{{ totalData&&(totalData.totalCancelAmount || totalData.totalCancelAmount==0) ? toThousands(totalData.totalCancelAmount) : '--' }}</strong>;
+                待下推金额:<strong>{{ totalData&&(totalData.totalUnpushedAmount || totalData.totalUnpushedAmount==0) ? toThousands(totalData.totalUnpushedAmount) : '--' }}</strong>;
+                已发货金额:<strong>{{ totalData&&(totalData.totalDispatchAmount || totalData.totalDispatchAmount==0) ? toThousands(totalData.totalDispatchAmount) : '--' }}</strong>;
               </div>
             </div>
             <a-checkbox v-model="showCancelNum"><span style="display: inline-block;margin-top: 1px;">显示取消数量</span></a-checkbox>
@@ -431,7 +431,7 @@ export default {
     },
     // 选择客户成功
     chooseCustomOk (data) {
-      this.$router.push({ name: 'salesAdd', params: { sn: data.salesBillSn } })
+      this.$router.push({ name: 'salesAdd', params: { sn: data.salesBillSn, wSn: data.warehouseSn } })
     },
     // 下推
     handleDispatch (row) {