Browse Source

Merge commit '07b2264e6be617318d84ca5dae216366e6188a9a' into HEAD

gitadmin 3 years ago
parent
commit
11d6a056a0

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

@@ -13,7 +13,7 @@
         <div style="text-align: center;">
           <h3 style="padding: 15px 0; font-weight: bold;">{{ nowData?nowData.shelfName:'' }}</h3>
           <div style="padding-bottom: 15px">
-            <p>此数字货架当前状态为<span style="display:inline-block;padding:0 3px">"{{ nowData&&nowData.stateDictValue }}"</span>,确定流转到下一个状态<span style="display:inline-block;padding:0 3px;color:red">"{{ nextState }}"</span>吗?</p>
+            <p>此数字货架当前状态为<span style="display:inline-block;padding:0 3px">"{{ nowData&&nowData.stateDictValue?nowData.stateDictValue:'--' }}"</span>,确定流转到下一个状态<span style="display:inline-block;padding:0 3px;color:red">"{{ nextState }}"</span>吗?</p>
             <p v-if="nowData&&nowData.state=='ENABLE'">暂停后汽车修理厂无法再使用数字货架</p>
             <p v-if="nowData&&nowData.state=='SUSPEND'">关闭后,该数字货架的所有数据都不可见</p>
             <p>状态流转后无法再回退,请谨慎操作!</p>

+ 2 - 0
src/views/numsGoodsShelves/goodsShelvesAdministration/list.vue

@@ -170,6 +170,8 @@ export default {
       this.showModal = true
       if (row) { //  编辑
         this.itemData = row
+      }else{
+        this.itemData=null
       }
     },
     // 货位设置

+ 5 - 5
src/views/numsGoodsShelves/partsDealerManagement/list.vue

@@ -57,8 +57,8 @@ export default {
       tableHeight: 0,
       // 查询参数
       queryParam: {
-        merchantNo: '',
-        bondRecordState: undefined
+        dealerSn: undefined,
+        merchantNo: ''
       },
       showModal: false,
       itemData: null, // 编辑行数据
@@ -95,7 +95,7 @@ export default {
   methods: {
     // 经销商 change
     dealerChange (obj) {
-      this.queryParam.merchantSn = obj.key || undefined
+      this.queryParam.dealerSn = obj.key || undefined
     },
     // 汽车修理厂 change
     storeChange (obj) {
@@ -114,8 +114,8 @@ export default {
     // 重置
     reset () {
       this.queryParam = {
-        shelfName: '',
-        bondRecordState: undefined
+        dealerSn: undefined,
+        merchantNo: ''
       }
       this.$refs.dealerList.resetForm()
       this.$refs.table.refresh(true)

+ 17 - 12
src/views/numsGoodsShelves/partsDealerManagement/setSHModal.vue

@@ -20,7 +20,7 @@
           :wrapperCol="{span:16}"
         >
           <a-form-model-item label="配件经销商" >
-            <span>{{ nowData.dealerName||'--' }}</span>
+            <span>{{ nowData&&nowData.dealerName?nowData.dealerName:'--' }}</span>
           </a-form-model-item>
           <a-form-model-item label="平台商户号" prop="merchantNo" >
             <a-input id="setSHModal-merchantNo" allowClear v-model.trim="form.merchantNo" placeholder="请输入平台商户号"/>
@@ -117,20 +117,25 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         console.log(valid, 'console.log(valid)')
         if (valid) {
-          const params = JSON.parse(JSON.stringify(_this.pageInfo))
+          // const params = JSON.parse(JSON.stringify(_this.pageInfo))
+          const params = JSON.parse(JSON.stringify(_this.form))
           console.log(params, 'params')
-          if (params) {
-            params.merchantBankAccountEntity.bankName = _this.form.bankName
-            params.merchantBankAccountEntity.bankAccount = _this.form.bankAccount
-            params.merchantBankAccountEntity.bankCard = _this.form.bankCard
-            // params.dealerEntity.dealerName = _this.form.dealerEntity.dealerName
-            params.merchantNo = _this.form.merchantNo
+          const a = {
+            merchantBankAccountEntity: {
+              bankName: params.bankName,
+              bankAccount: params.bankAccount,
+              bankCard: params.bankCard
+            }
           }
-          console.log(params, 'params')
-          params.id = _this.nowData && _this.nowData.id ? _this.nowData.id : null
-          params.dealerEntity.dealerSn = _this.nowData && _this.nowData.dealerEntity ? _this.nowData.dealerEntity.dealerSn : null
+          const data = Object.assign(params, a)
+          data.id = _this.nowData && _this.nowData.id ? _this.nowData.id : null
+          data.merchantSn = _this.nowData ? _this.nowData.dealerSn : null
+          data.dealerName = data.dealerName ? data.dealerName : _this.nowData.dealerName
+          delete data.bankName
+          delete data.bankAccount
+          delete data.bankCard
           _this.spinning = true
-          console.log(params, 'params')
+          console.log(data, 'data', '=================----------------')
           saveMerchantAccount(params).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)