瀏覽代碼

Merge branch 'develop_szhj' of jianguan-web/jq-repairFusion-html into develop

李磊 3 年之前
父節點
當前提交
daf7a513a5

+ 2 - 1
src/views/numsGoodsShelves/goodsShelvesAdministration/addGoodsShelve.vue

@@ -205,11 +205,12 @@ export default {
     },
     isshow (newValue, oldValue) {
       if (!newValue) {
+        this.form = {}
+        this.form.ownerType = 1
         if (!this.nowData) {
           this.$refs.storeList.resetForm()
           this.$refs.dealerList.resetForm()
         }
-
         this.$refs.ruleForm.resetFields()
         this.titleText = '新增数字货架'
         this.$emit('close')

+ 9 - 1
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementModifyModal.vue

@@ -103,7 +103,7 @@
             </a-col>
             <a-col :span="20">
               <a-form-model-item :label="form.settleType=='CREDIT'?'超过授信额度':'超期未结算'" v-if="form.settleType">
-                <a-checkbox id="settlementModifyModal-onChange" :checked="form.limitFlag==1">
+                <a-checkbox id="settlementModifyModal-onChange" :checked="form.limitFlag==1" @change="onChange">
                   限制汽车修理厂无法使用数字货架
                 </a-checkbox>
               </a-form-model-item>
@@ -183,6 +183,14 @@ 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

+ 17 - 27
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue

@@ -28,22 +28,21 @@
         </a-collapse>
         <a-collapse :activeKey="['1']" class="bzj-collapse" v-if="pageInfo&&pageInfo.settleType">
           <a-collapse-panel key="1" header="保证金 ( 保证金的新增/编辑/删除请在左侧菜单“保证金管理”功能中操作 )">
-            <s-table
+            <a-table
               class="sTable fixPagination"
               ref="table"
               size="small"
               rowKey="id"
-              :showPagination="false"
+              :pagination="false"
               :columns="columns"
-              :data="loadData"
-              :defaultLoadData="true"
+              :data-source="loadData"
               bordered>
               <template slot="status" slot-scope="text, record">
                 <a-button type="link" @click="handleEdit(record)" id="settlementSet-handleEdit">编辑</a-button>
                 <a-button type="link" @click="handleDel(record)" id="settlementSet-handleDel">删除</a-button>
               <!-- <span v-if="!($hasPermissions('B_powerMD_user_edit') && record.superAdmin!=1) && !(record.loginFlag==1 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_restPwd')) && !(record.loginFlag==0 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_del'))">--</span> -->
               </template>
-            </s-table>
+            </a-table>
           </a-collapse-panel>
         </a-collapse>
       </a-card>
@@ -188,13 +187,13 @@
 </template>
 
 <script>
-import { STable, VSelect } from '@/components'
+import { VSelect } from '@/components'
 import { shelfDetail, shelfSettleRuleSave, settleRuleDetail } from '@/api/shelf.js'
 import { bondRecordList } from '@/api/boundRecord.js'
 import settlementModifyModal from './settlementModifyModal.vue'
 import { toThousands } from '@/libs/tools.js'
 export default {
-  components: { STable, settlementModifyModal, VSelect },
+  components: { settlementModifyModal, VSelect },
   data () {
     return {
       spinning: false,
@@ -236,24 +235,7 @@ export default {
         { title: '保证金金额', dataIndex: 'bondAmount', width: '30%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '支付时间', width: '20%', align: 'center', dataIndex: 'payDate' }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        this.spinning = true
-        return bondRecordList(Object.assign({ shelfSn: this.$route.params.shelfSn })).then(res => {
-          let data
-          if (res.status == 200) {
-            data = res.data
-            const no = (data.pageNo - 1) * data.pageSize
-            for (let i = 0; i < data.length; i++) {
-              const _item = data[i]
-              _item.no = no + i + 1
-            }
-          }
-          this.spinning = false
-          return data
-        })
-      }
+      ]
     }
   },
   methods: {
@@ -288,6 +270,15 @@ export default {
     changeRadio (e) {
       this.isEdit = e.target.value
     },
+    getbondRecordList () {
+      this.spinning = true
+      bondRecordList(Object.assign({ shelfSn: this.$route.params.shelfSn })).then(res => {
+        if (res.status == 200) {
+          this.loadData = res.data || []
+        }
+        this.spinning = false
+      })
+    },
     // 数字货架详情
     getShelfDetail () {
       this.spinning = true
@@ -338,11 +329,9 @@ export default {
     },
     // 修改
     handleModify (shelfVal, settleVal) {
-      console.log(shelfVal, settleVal, '----------修改')
       this.pageInfo = shelfVal
       this.settleInfo = settleVal
       this.openModal = true
-      console.log('----------修改')
     },
     // 保存
     handleSubmit () {
@@ -380,6 +369,7 @@ export default {
     },
     pageInit () {
       this.getShelfDetail()
+      this.getbondRecordList()
     }
   },
   mounted () {