zhangdan 3 gadi atpakaļ
vecāks
revīzija
406e50ee20

+ 13 - 7
src/views/numsGoodsShelves/goodsShelvesAdministration/addGoodsShelve.vue

@@ -43,7 +43,7 @@
             <!-- 状态 -->
             <!-- 状态 -->
             <a-col :span="12">
             <a-col :span="12">
               <a-form-model-item label="货架归属" prop="ownerType">
               <a-form-model-item label="货架归属" prop="ownerType">
-                <a-radio-group name="radioGroup" v-model="form.ownerType" @change="changeRadio" id="addGoodsShelve-changeRadio">
+                <a-radio-group name="radioGroup" v-model="form.ownerType" id="addGoodsShelve-ownerType">
                   <a-radio :value="1">平台</a-radio>
                   <a-radio :value="1">平台</a-radio>
                   <a-radio :value="0">自有</a-radio>
                   <a-radio :value="0">自有</a-radio>
                 </a-radio-group>
                 </a-radio-group>
@@ -146,10 +146,10 @@ export default {
       this.form.images = file
       this.form.images = file
     },
     },
     // 改变货架归属
     // 改变货架归属
-    changeRadio (e) {
-      this.form.ownerType = e.target.value
-      console.log(e.target.value, '=========')
-    },
+    // changeRadio (e) {
+    //   this.form.ownerType = e.target.value
+    //   console.log(e.target.value, '=========')
+    // },
     // 查询货架详情
     // 查询货架详情
     getShelfDetail () {
     getShelfDetail () {
       this.spinning = true
       this.spinning = true
@@ -205,8 +205,14 @@ export default {
     },
     },
     isshow (newValue, oldValue) {
     isshow (newValue, oldValue) {
       if (!newValue) {
       if (!newValue) {
-        this.form = {}
-        this.form.ownerType = 1
+        this.form = {
+          dealerSn: undefined, // 经销商sn
+          ownerType: 1, // 平台
+          storeSn: undefined, // 汽车修理厂sn
+          shelfName: '', // 货架名称
+          images: '', // 图片
+          remarks: ''// 备注
+        }
         if (!this.nowData) {
         if (!this.nowData) {
           this.$refs.storeList.resetForm()
           this.$refs.storeList.resetForm()
           this.$refs.dealerList.resetForm()
           this.$refs.dealerList.resetForm()

+ 4 - 4
src/views/numsGoodsShelves/goodsShelvesAdministration/goodsAllocationSet.vue

@@ -15,8 +15,8 @@
             <a-descriptions size="small" :column="3">
             <a-descriptions size="small" :column="3">
               <a-descriptions-item label="配件经销商">{{ pageInfo&&pageInfo.dealerName?pageInfo.dealerName:'--' }}</a-descriptions-item>
               <a-descriptions-item label="配件经销商">{{ pageInfo&&pageInfo.dealerName?pageInfo.dealerName:'--' }}</a-descriptions-item>
               <a-descriptions-item label="汽车修理厂">{{ pageInfo&&pageInfo.storeName?pageInfo.storeName:'--' }}</a-descriptions-item>
               <a-descriptions-item label="汽车修理厂">{{ pageInfo&&pageInfo.storeName?pageInfo.storeName:'--' }}</a-descriptions-item>
-              <a-descriptions-item label="货架归属">{{ pageInfo&&pageInfo.ownerType==1?'自有':'平台' }}</a-descriptions-item>
-              <a-descriptions-item label="货架图片" v-if="pageInfo&&pageInfo.ownerType==1">
+              <a-descriptions-item label="货架归属">{{ pageInfo&&pageInfo.ownerType==0?'自有':'平台' }}</a-descriptions-item>
+              <a-descriptions-item label="货架图片" v-if="pageInfo&&pageInfo.ownerType==0">
                 <div v-if="pageInfo && pageInfo.images&&pageInfo.images.length>0">
                 <div v-if="pageInfo && pageInfo.images&&pageInfo.images.length>0">
                   <img :src="pageInfo.images[0]|| ''" width="30" height="30" class="imageUrl" @click="inited(pageInfo.images)" /> {{ '共'+pageInfo?pageInfo.images.length+'张':'' }}
                   <img :src="pageInfo.images[0]|| ''" width="30" height="30" class="imageUrl" @click="inited(pageInfo.images)" /> {{ '共'+pageInfo?pageInfo.images.length+'张':'' }}
                 </div>
                 </div>
@@ -200,7 +200,7 @@ export default {
       if (type == 0) {
       if (type == 0) {
         this.openModal = true
         this.openModal = true
       } else {
       } else {
-        this.itemData=null
+        this.itemData = null
         this.openHWModal = true
         this.openHWModal = true
       }
       }
     },
     },
@@ -239,7 +239,7 @@ export default {
     handleEdit (row) {
     handleEdit (row) {
       // this.shelfPlaceSn = row.shelfPlaceSn
       // this.shelfPlaceSn = row.shelfPlaceSn
       this.shelfSn = row.shelfSn
       this.shelfSn = row.shelfSn
-      this.itemData=row
+      this.itemData = row
       this.openHWModal = true
       this.openHWModal = true
     },
     },
     // 货架详情
     // 货架详情

+ 12 - 11
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue

@@ -15,8 +15,8 @@
             <a-descriptions size="small" :column="3">
             <a-descriptions size="small" :column="3">
               <a-descriptions-item label="配件经销商">{{ pageInfo&&pageInfo.dealerName?pageInfo.dealerName:'--' }}</a-descriptions-item>
               <a-descriptions-item label="配件经销商">{{ pageInfo&&pageInfo.dealerName?pageInfo.dealerName:'--' }}</a-descriptions-item>
               <a-descriptions-item label="汽车修理厂">{{ pageInfo&&pageInfo.storeName?pageInfo.storeName:'--' }}</a-descriptions-item>
               <a-descriptions-item label="汽车修理厂">{{ pageInfo&&pageInfo.storeName?pageInfo.storeName:'--' }}</a-descriptions-item>
-              <a-descriptions-item label="货架归属">{{ pageInfo&&pageInfo.ownerType==1?'自有':'平台' }}</a-descriptions-item>
-              <a-descriptions-item label="货架图片" v-if="pageInfo&&pageInfo.ownerType==1">
+              <a-descriptions-item label="货架归属">{{ pageInfo&&pageInfo.ownerType==1?'平台':'自有' }}</a-descriptions-item>
+              <a-descriptions-item label="货架图片" v-if="pageInfo&&pageInfo.ownerType==0">
                 <div v-if="pageInfo && pageInfo.images&&pageInfo.images.length>0">
                 <div v-if="pageInfo && pageInfo.images&&pageInfo.images.length>0">
                   <img :src="pageInfo.images[0]|| ''" width="30" height="30" class="imageUrl" @click="inited(pageInfo.images)" /> {{ '共'+pageInfo.images.length+'张' }}
                   <img :src="pageInfo.images[0]|| ''" width="30" height="30" class="imageUrl" @click="inited(pageInfo.images)" /> {{ '共'+pageInfo.images.length+'张' }}
                 </div>
                 </div>
@@ -242,10 +242,18 @@ export default {
   methods: {
   methods: {
     handleBack () {
     handleBack () {
       this.isEdit = false
       this.isEdit = false
-      this.form = {}
+      this.form = {
+        settleType: undefined, // 结算方式
+        creditLimit: '', // 授信额度
+        creditWarnLimit: '', // 结算提醒金额
+        settleDay: undefined, // 每月结算日
+        warnBeforeDays: undefined, // 结算提醒提前天数
+        limitFlag: 0, // 是否限制使用
+        bondFlag: '', // 是否缴纳保证金
+        bondAmount: '' // 保证金金额
+      }
       this.$refs.ruleForm.resetFields()
       this.$refs.ruleForm.resetFields()
       this.$router.push({ path: '/numsGoodsShelves/goodsShelvesAdministration/list' })
       this.$router.push({ path: '/numsGoodsShelves/goodsShelvesAdministration/list' })
-      // this.$router.go(-1)
     },
     },
     // 查看图片
     // 查看图片
     inited (viewer) {
     inited (viewer) {
@@ -261,7 +269,6 @@ export default {
     },
     },
     changeSettleType (value, option) {
     changeSettleType (value, option) {
       this.form.settleType = value
       this.form.settleType = value
-      console.log(value, this.form.settleType, 'this.form.settleType')
     },
     },
     onChange (e) {
     onChange (e) {
       console.log(e.target.checked)
       console.log(e.target.checked)
@@ -270,12 +277,10 @@ export default {
       } else {
       } else {
         this.form.limitFlag = 0
         this.form.limitFlag = 0
       }
       }
-      console.log(this.form.limitFlag, 'this.form.limitFlag')
     },
     },
     //
     //
     changeRadio (e) {
     changeRadio (e) {
       console.log(e.target.value, 'e.target.value')
       console.log(e.target.value, 'e.target.value')
-      // this.isEdit = e.target.value
       this.isEdit = e.target.value == 1
       this.isEdit = e.target.value == 1
     },
     },
     getbondRecordList () {
     getbondRecordList () {
@@ -346,10 +351,6 @@ export default {
       this.$refs.ruleForm.validate(valid => {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
         if (valid) {
           const params = Object.assign({}, _this.form)
           const params = Object.assign({}, _this.form)
-          console.log(params, 'params', _this.form)
-          // if (params.limitFlag == '') {
-          //   params.limitFlag = 0
-          // }
           if (this.pageInfo) {
           if (this.pageInfo) {
             params.shelfSn = this.pageInfo.shelfSn
             params.shelfSn = this.pageInfo.shelfSn
             params.storeSn = this.pageInfo.storeSn
             params.storeSn = this.pageInfo.storeSn