zhangdan 3 年之前
父節點
當前提交
9203c17c6f

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

@@ -113,17 +113,17 @@ export const asyncRouterMap = [
               icon: 'user'
               // permission: 'M_powerMD_user_list'
             }
+          },
+          {
+            path: '/numsGoodsShelves/partsDealerManagement',
+            name: 'partsDealerManagementList',
+            component: () => import('@/views/numsGoodsShelves/partsDealerManagement/list.vue'),
+            meta: {
+              title: '配件经销商管理',
+              icon: 'user'
+              // permission: 'M_powerMD_user_list'
+            }
           }
-          // {
-          //   path: '/numsGoodsShelves/partsDealerManagement',
-          //   name: 'partsDealerManagementList',
-          //   component: () => import('@/views/numsGoodsShelves/partsDealerManagement/list.vue'),
-          //   meta: {
-          //     title: '配件经销商管理',
-          //     icon: 'user'
-          //     // permission: 'M_powerMD_user_list'
-          //   }
-          // }
         ]
       },
       // 系统设置

+ 18 - 16
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementModifyModal.vue

@@ -7,7 +7,7 @@
       :maskClosable="false"
       title="修改结算方式"
       v-model="isshow"
-      @cancle="isshow=false"
+      @cancle="handleBack"
       :width="650">
       <a-spin :spinning="spinning" tip="Loading...">
         <a-form-model
@@ -21,7 +21,7 @@
           <a-row :gutter="24">
             <a-col :span="20">
               <a-form-model-item label="当前结算方式">
-                {{ shelfInfo&&shelfInfo.settleType=='CREDIT'?'授信结算':'按月结算' }}
+                {{ settleInfo&&settleInfo.settleType=='CREDIT'?'授信结算':'按月结算' }}
               </a-form-model-item>
             </a-col>
             <a-col :span="20">
@@ -33,7 +33,7 @@
                   allowClear
                   v-model="form.settleType"
                 >
-                  <a-select-option v-for="item in settlementTypeList" :key="item.code" :value="item.code" :disabled="shelfInfo&&shelfInfo.settleType==item.code?true:false">{{ item.name }}</a-select-option>
+                  <a-select-option v-for="item in settlementTypeList" :key="item.code" :value="item.code" :disabled="settleInfo&&settleInfo.settleType==item.code?true:false">{{ item.name }}</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>
@@ -103,7 +103,7 @@
             </a-col>
             <a-col :span="20">
               <a-form-model-item :label="form.settleType=='CREDIT'?'超过授信额度':'超期未结算'" v-if="form.settleType">
-                <a-checkbox @change="onChange" id="settlementModifyModal-onChange" :checked="form.limitFlag==1">
+                <a-checkbox id="settlementModifyModal-onChange" :checked="form.limitFlag==1" v-model="form.limitFlag">
                   限制汽车修理厂无法使用数字货架
                 </a-checkbox>
               </a-form-model-item>
@@ -163,7 +163,7 @@ export default {
         creditWarnLimit: '', // 结算提醒金额
         settleDay: undefined, // 每月结算日
         warnBeforeDays: undefined, // 结算提醒提前天数
-        limitFlag: '' // 是否限制使用
+        limitFlag: false// 是否限制使用
       },
       rules: {
         settleType: [ { required: true, message: '请选择结算方式', trigger: 'change' } ],
@@ -183,15 +183,6 @@ export default {
       str = str.replace(/[\r\n]/g, '')
       this.form.name = str
     },
-    //
-    onChange (e) {
-      console.log(e.target.checked, '============')
-      if (e.target.checked) {
-        this.form.limitFlag = 1
-      } else {
-        this.form.limitFlag = 0
-      }
-    },
     // 改变货架归属
     changeRadio (e) {
       this.form.loginFlag = e.target.value
@@ -203,10 +194,13 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = JSON.parse(JSON.stringify(_this.form))
-          console.log(params, 'params.limitFlag')
-          if (params.limitFlag == '') {
+          console.log(params.limitFlag, params, '!params.limitFlag')
+          if (params.limitFlag == undefined || params.limitFlag == false) {
             params.limitFlag = 0
+          } else {
+            params.limitFlag = 1
           }
+          console.log(params, 'params', _this.form)
           if (this.shelfInfo) {
             console.log(this.shelfInfo, 'this.nowData')
             params.shelfSn = this.shelfInfo.shelfSn
@@ -238,6 +232,14 @@ export default {
       })
     },
     handleBack () {
+      this.form = {
+        settleType: undefined, // 结算方式
+        creditLimit: '', // 授信额度
+        creditWarnLimit: '', // 结算提醒金额
+        settleDay: undefined, // 每月结算日
+        warnBeforeDays: undefined, // 结算提醒提前天数
+        limitFlag: 0 // 是否限制使用
+      }
       this.$emit('close')
     }
   },

+ 1 - 1
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue

@@ -349,7 +349,7 @@ export default {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          const params = JSON.parse(JSON.stringify(_this.form))
+          const params = Object.assign({}, _this.form)
           console.log(params, 'params')
           if (params.limitFlag == '') {
             params.limitFlag = 0

+ 26 - 7
src/views/numsGoodsShelves/partsDealerManagement/setSHModal.vue

@@ -31,18 +31,18 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="24">
-              <a-form-model-item label="结算账户名" prop="merchantNo">
-                <a-input id="userList-name" allowClear v-model.trim="form.merchantNo" placeholder="请输入结算账户名"/>
+              <a-form-model-item label="结算账户名" prop="bankAccount">
+                <a-input id="userList-name" allowClear v-model.trim="form.merchantBankAccountEntity.bankAccount" placeholder="请输入结算账户名"/>
               </a-form-model-item>
             </a-col>
             <a-col :span="24">
-              <a-form-model-item label="结算账户号" prop="merchantNo">
-                <a-input id="userList-name" allowClear v-model.trim="form.merchantNo" placeholder="请输入结算账户号"/>
+              <a-form-model-item label="结算账户号" prop="bankCard">
+                <a-input id="userList-name" allowClear v-model.trim="form.merchantBankAccountEntity.bankCard" placeholder="请输入结算账户号"/>
               </a-form-model-item>
             </a-col>
             <a-col :span="24">
-              <a-form-model-item label="开户银行" prop="merchantNo">
-                <a-input id="userList-name" allowClear v-model.trim="form.merchantNo" placeholder="请输入开户银行"/>
+              <a-form-model-item label="开户银行" prop="bankName">
+                <a-input id="userList-name" allowClear v-model.trim="form.merchantBankAccountEntity.bankName" placeholder="请输入开户银行"/>
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -87,15 +87,34 @@ export default {
         dealerEntity: {
           dealerName: ''
         },
+        merchantBankAccountEntity: {
+          bankName: '', // 开户行
+          bankAccount: '', // 账户名
+          bankCard: '' // 账户号
+        },
         merchantNo: '' // 保证金金额
       },
       rules: {
-        merchantNo: [ { required: true, message: '请输入保证金金额', trigger: 'blur' } ]
+        merchantNo: [ { required: true, message: '请输入保证金金额', trigger: 'blur' } ],
+        bankName: [ { required: true, message: '请输入开户银行', trigger: 'blur' } ],
+        bankAccount: [ { required: true, message: '请输入结算账户名', trigger: 'blur' } ],
+        bankCard: [ { required: true, message: '请输入结算账户号', trigger: 'blur' } ]
       }
     }
   },
   methods: {
     close (e) {
+      this.form = {
+        dealerEntity: {
+          dealerName: ''
+        },
+        merchantBankAccountEntity: {
+          bankName: '', // 开户行
+          bankAccount: '', // 账户名
+          bankCard: '' // 账户号
+        },
+        merchantNo: '' // 保证金金额
+      }
       this.$refs.ruleForm.resetFields()
       this.$emit('close')
     },