zhangdan 3 years ago
parent
commit
4f8bb711ad

+ 3 - 3
src/components/UploadFile/index.vue

@@ -225,13 +225,13 @@ export default {
       }
       }
 
 
       // 文件大小
       // 文件大小
-      const isLt2M = file.size / 1024 / 1024 < this.fileSize
+      const isLt2M = file.size / 1024 < this.fileSize
       if (!isLt2M) {
       if (!isLt2M) {
         if (tip != 0) {
         if (tip != 0) {
           if (this.fileType != 'video/mp4') {
           if (this.fileType != 'video/mp4') {
-            this.$message.error('图片不能超过 ' + this.fileSize + 'MB!')
+            this.$message.error('图片不能超过 ' + this.fileSize + 'KB!')
           } else {
           } else {
-            this.$message.error('视频不能超过 ' + this.fileSize + 'MB!')
+            this.$message.error('视频不能超过 ' + this.fileSize + 'KB!')
           }
           }
         }
         }
         return isLt2M
         return isLt2M

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

@@ -113,17 +113,17 @@ export const asyncRouterMap = [
               icon: 'user'
               icon: 'user'
               // permission: 'M_powerMD_user_list'
               // 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'
+          //   }
+          // }
         ]
         ]
       },
       },
       // 系统设置
       // 系统设置

+ 7 - 8
src/views/numsGoodsShelves/bondManagement/addGoodsShelve.vue → src/views/numsGoodsShelves/bondManagement/addbond.vue

@@ -3,7 +3,7 @@
     <a-spin :spinning="spinning" tip="Loading...">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-modal
       <a-modal
         centered
         centered
-        wrapClassName="addGoodsShelve-modal"
+        wrapClassName="addbond-modal"
         :footer="null"
         :footer="null"
         :maskClosable="false"
         :maskClosable="false"
         :title="titleText"
         :title="titleText"
@@ -11,7 +11,7 @@
         @cancle="isshow=false"
         @cancle="isshow=false"
         :width="650">
         :width="650">
         <a-form-model
         <a-form-model
-          id="userEdit-form"
+          id="addbond-form"
           ref="ruleForm"
           ref="ruleForm"
           :model="form"
           :model="form"
           :rules="rules"
           :rules="rules"
@@ -21,7 +21,7 @@
           <a-row :gutter="24">
           <a-row :gutter="24">
             <a-col :span="20">
             <a-col :span="20">
               <a-form-model-item label="货架名称" prop="shelfSn" >
               <a-form-model-item label="货架名称" prop="shelfSn" >
-                <shelfList ref="shelfList" @change="shelfChange" v-if="!nowData"></shelfList>
+                <shelfList ref="shelfList" @change="shelfChange" v-if="!nowData" id="addbond-shelfName"></shelfList>
                 <span v-if="nowData">{{ form.shelfName||'--' }}</span>
                 <span v-if="nowData">{{ form.shelfName||'--' }}</span>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
@@ -40,7 +40,7 @@
             <a-col :span="20">
             <a-col :span="20">
               <a-form-model-item label="保证金缴纳金额" prop="bondAmount" >
               <a-form-model-item label="保证金缴纳金额" prop="bondAmount" >
                 <a-input-number
                 <a-input-number
-                  id="shelfSet-bindProduct-bondAmount"
+                  id="addbond-bondAmount"
                   v-model="form.bondAmount"
                   v-model="form.bondAmount"
                   :precision="2"
                   :precision="2"
                   :min="0.01"
                   :min="0.01"
@@ -52,8 +52,8 @@
             <a-col :span="2"> <span style="display: inline-block; padding-top: 10px;">元</span></a-col>
             <a-col :span="2"> <span style="display: inline-block; padding-top: 10px;">元</span></a-col>
           </a-row>
           </a-row>
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
-            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="isshow=false">取消</a-button>
+            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }" id="addbond-handleSubmit">保存</a-button>
+            <a-button :style="{ marginLeft: '8px' }" @click="isshow=false" id="addbond-close">取消</a-button>
           </a-form-model-item>
           </a-form-model-item>
         </a-form-model>
         </a-form-model>
       </a-modal>
       </a-modal>
@@ -69,7 +69,7 @@ import dealerList from '@/views/common/dealerList.vue'
 import storeList from '@/views/common/storeList.vue'
 import storeList from '@/views/common/storeList.vue'
 import shelfList from '@/views/common/shelfList.vue'
 import shelfList from '@/views/common/shelfList.vue'
 export default {
 export default {
-  name: 'AddGoodsShelve',
+  name: 'Addbond',
   components: { STable, VSelect, Upload, dealerList, storeList, shelfList },
   components: { STable, VSelect, Upload, dealerList, storeList, shelfList },
   props: {
   props: {
     visible: {
     visible: {
@@ -161,7 +161,6 @@ export default {
       bondRecordDetail({ bondRecordSn: this.nowData.bondRecordSn }).then(res => {
       bondRecordDetail({ bondRecordSn: this.nowData.bondRecordSn }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.dealerName = res.data.dealerName
           this.dealerName = res.data.dealerName
-          // console.log(this.form.dealerEntity.dealerName, ' this.form.dealerEntity.dealerName')/
           this.shelfName = res.data.shelfName
           this.shelfName = res.data.shelfName
           this.storeName = res.data.storeName
           this.storeName = res.data.storeName
           this.form.bondAmount = res.data.bondAmount
           this.form.bondAmount = res.data.bondAmount

+ 26 - 47
src/views/numsGoodsShelves/bondManagement/list.vue

@@ -6,29 +6,29 @@
           <a-row :gutter="15">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="货架名称">
               <a-form-item label="货架名称">
-                <a-input id="userList-name" allowClear v-model.trim="queryParam.shelfName" placeholder="请输入货架名称"/>
+                <a-input id="bondManagementList-shelfName" allowClear v-model.trim="queryParam.shelfName" placeholder="请输入货架名称"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="配件经销商">
               <a-form-item label="配件经销商">
-                <dealerList ref="dealerList" @change="dealerChange" :itemSn="queryParam.dealerSn"></dealerList>
+                <dealerList ref="dealerList" @change="dealerChange" id="bondManagementList-dealerChange"></dealerList>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="汽车修理厂">
               <a-form-item label="汽车修理厂">
-                <storeList ref="storeList" @change="storeChange" :itemSn="queryParam.storeSn"></storeList>
+                <storeList ref="storeList" @change="storeChange" id="bondManagementList-storeChange"></storeList>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <template v-if="advanced">
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="状态">
                 <a-form-item label="状态">
-                  <v-select id="userList-loginFlag" code="BOND_RECORD_STATE" v-model="queryParam.bondRecordState" allowClear placeholder="请选择状态"></v-select>
+                  <v-select id="bondManagementList-bondRecordState" code="BOND_RECORD_STATE" v-model="queryParam.bondRecordState" allowClear placeholder="请选择状态"></v-select>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
             </template>
             </template>
             <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
             <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" id="userList-search">查询</a-button>
-              <a-button type="" @click="reset" id="userList-reset" style="margin-left: 10px;">重置</a-button>
+              <a-button type="primary" @click="$refs.table.refresh(true)" id="bondManagementList-refresh">查询</a-button>
+              <a-button type="" @click="reset" style="margin-left: 10px;" id="bondManagementList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -38,7 +38,7 @@
         </a-form>
         </a-form>
       </div>
       </div>
       <div class="table-operator">
       <div class="table-operator">
-        <a-button size="small" type="primary" class="button-error" @click="handleEdit()">新增保证金</a-button>
+        <a-button size="small" type="primary" class="button-error" @click="handleEdit()" id="bondManagementList-handleEdit">新增保证金</a-button>
       </div>
       </div>
       <s-table
       <s-table
         class="sTable fixPagination"
         class="sTable fixPagination"
@@ -52,28 +52,40 @@
         :defaultLoadData="false"
         :defaultLoadData="false"
         bordered>
         bordered>
         <template slot="action" slot-scope="text, record" >
         <template slot="action" slot-scope="text, record" >
-          <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" v-if="record.state=='WAIT'">编辑</a-button>
-          <a-button size="small" type="link" class="button-info" @click="handleDel(record)" v-if="record.state=='WAIT'">删除</a-button>
+          <a-button
+            size="small"
+            type="link"
+            class="button-info"
+            @click="handleEdit(record)"
+            v-if="record.state=='WAIT'"
+            id="bondManagementList-handleEdit">编辑</a-button>
+          <a-button
+            size="small"
+            type="link"
+            class="button-info"
+            @click="handleDel(record)"
+            v-if="record.state=='WAIT'"
+            id="bondManagementList-handleDel">删除</a-button>
           <span style="display:inline-block;padding-left:7px" v-if="record.state=='FINISH'">--</span>
           <span style="display:inline-block;padding-left:7px" v-if="record.state=='FINISH'">--</span>
           <!-- <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'))" style="display:inline-block;padding-left:7px">--</span> -->
           <!-- <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'))" style="display:inline-block;padding-left:7px">--</span> -->
         </template>
         </template>
       </s-table>
       </s-table>
     </a-spin>
     </a-spin>
     <!--新增/编辑数字货架 -->
     <!--新增/编辑数字货架 -->
-    <addGoodsShelve :visible="showModal" @refresh="$refs.table.refresh(true)" :nowData="itemData" @close="handleUserCancel"></addGoodsShelve>
+    <addbond :visible="showModal" @refresh="$refs.table.refresh(true)" :nowData="itemData" @close="handleUserCancel"></addbond>
   </a-card>
   </a-card>
 </template>
 </template>
 
 
 <script>
 <script>
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
-import addGoodsShelve from './addGoodsShelve.vue'
+import addbond from './addbond.vue'
 import { bondRecordByPage, bondRecordDel } from '@/api/boundRecord.js'
 import { bondRecordByPage, bondRecordDel } from '@/api/boundRecord.js'
 import dealerList from '@/views/common/dealerList.vue'
 import dealerList from '@/views/common/dealerList.vue'
 import storeList from '@/views/common/storeList.vue'
 import storeList from '@/views/common/storeList.vue'
 import { toThousands } from '@/libs/tools.js'
 import { toThousands } from '@/libs/tools.js'
 export default {
 export default {
   name: 'UserList',
   name: 'UserList',
-  components: { STable, VSelect, dealerList, storeList, addGoodsShelve },
+  components: { STable, VSelect, dealerList, storeList, addbond },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -114,9 +126,7 @@ export default {
           this.spinning = false
           this.spinning = false
           return data
           return data
         })
         })
-      },
-      optionAlertShow: false,
-      showSyncModal: false //  同步账号编辑弹框
+      }
     }
     }
   },
   },
   methods: {
   methods: {
@@ -136,7 +146,6 @@ export default {
         this.itemData = null
         this.itemData = null
       }
       }
       this.showModal = true
       this.showModal = true
-      console.log(this.itemData, 'this.itemData')
     },
     },
     // 关闭弹框
     // 关闭弹框
     handleUserCancel () {
     handleUserCancel () {
@@ -176,34 +185,6 @@ export default {
         }
         }
       })
       })
     },
     },
-    // 结算设置
-    handleSettlement (row) {
-      this.$router.push({ name: 'settlementSet', params: { id: row.id } })
-    },
-    // 关闭弹框 同步账号
-    handleCancel () {
-      this.itemData = null
-      this.showSyncModal = false
-    },
-    // 修改状态
-    changeFlagHandle (text, record) {
-      this.openStatusModal = true
-      // const _data = {
-      //   id: record.id,
-      //   flag: record.loginFlag ? '1' : '0'
-      // }
-      // this.spinning = true
-      // updateEnableStatus(_data).then(res => {
-      //   if (res.status == 200) {
-      //     this.$message.success(res.message)
-      //     this.$refs.table.refresh()
-      //     this.spinning = false
-      //   } else {
-      //     this.$refs.table.refresh()
-      //     this.spinning = false
-      //   }
-      // })
-    },
     pageInit () {
     pageInit () {
       const _this = this
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
       this.$nextTick(() => { // 页面渲染完成后的回调
@@ -236,7 +217,5 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="less">
 <style lang="less">
-  .ant-statistic-content-value-decimal{
-    font-size: 12px;
-  }
+
 </style>
 </style>

+ 23 - 25
src/views/numsGoodsShelves/goodsShelvesAdministration/addGoodsShelve.vue

@@ -11,7 +11,7 @@
       :width="800">
       :width="800">
       <a-spin :spinning="spinning" tip="Loading...">
       <a-spin :spinning="spinning" tip="Loading...">
         <a-form-model
         <a-form-model
-          id="userEdit-form"
+          id="addGoodsShelve-form"
           ref="ruleForm"
           ref="ruleForm"
           :model="form"
           :model="form"
           :rules="rules"
           :rules="rules"
@@ -21,13 +21,13 @@
           <a-row :gutter="24">
           <a-row :gutter="24">
             <a-col :span="12">
             <a-col :span="12">
               <a-form-model-item label="配件经销商" prop="dealerSn">
               <a-form-model-item label="配件经销商" prop="dealerSn">
-                <dealerList ref="dealerList" @change="dealerChange" v-if="!nowData"></dealerList>
+                <dealerList ref="dealerList" @change="dealerChange" v-if="!nowData" id="addGoodsShelve-dealerChange"></dealerList>
                 <span v-else>{{ form.dealerName }}</span>
                 <span v-else>{{ form.dealerName }}</span>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :span="12">
             <a-col :span="12">
               <a-form-model-item label="汽车修理厂" prop="storeSn">
               <a-form-model-item label="汽车修理厂" prop="storeSn">
-                <storeList ref="storeList" @change="storeChange" v-if="!nowData"></storeList>
+                <storeList ref="storeList" @change="storeChange" v-if="!nowData" id="addGoodsShelve-storeChange"></storeList>
                 <span v-else>{{ form.storeName }}</span>
                 <span v-else>{{ form.storeName }}</span>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
@@ -35,7 +35,7 @@
           <a-row :gutter="20">
           <a-row :gutter="20">
             <a-col :span="24">
             <a-col :span="24">
               <a-form-model-item label="货架名称" prop="shelfName" :label-col="{span: 3}" :wrapper-col="{span: 20}">
               <a-form-model-item label="货架名称" prop="shelfName" :label-col="{span: 3}" :wrapper-col="{span: 20}">
-                <a-input id="userEdit-shelfName" v-model.trim="form.shelfName" :maxLength="30" allowClear placeholder="请输入货架名称(最多30个字符)"/>
+                <a-input id="addGoodsShelve-shelfName" v-model.trim="form.shelfName" :maxLength="30" allowClear placeholder="请输入货架名称(最多30个字符)"/>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
           </a-row>
           </a-row>
@@ -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">
+                <a-radio-group name="radioGroup" v-model="form.ownerType" @change="changeRadio" id="addGoodsShelve-changeRadio">
                   <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>
@@ -52,15 +52,15 @@
           </a-row>
           </a-row>
           <a-row :gutter="24" v-if="form.ownerType===0">
           <a-row :gutter="24" v-if="form.ownerType===0">
             <a-col :span="24">
             <a-col :span="24">
-              <a-form-model-item label="产品图片" help="说明:请上传清晰、完整的图片,支持jpg/jpeg/png格式,不超过500KB(最多5张)。" :label-col="{span:3}" :wrapper-col="{span:20}">
+              <a-form-model-item label="产品图片" prop="images" help="说明:请上传清晰、完整的图片,支持jpg/jpeg/png格式,不超过500KB(最多5张)。" :label-col="{span:3}" :wrapper-col="{span:20}">
                 <Upload
                 <Upload
                   class="upload"
                   class="upload"
                   id="addGoodsShelve-images"
                   id="addGoodsShelve-images"
                   v-model="form.images"
                   v-model="form.images"
+                  :fileSize="500"
                   ref="images"
                   ref="images"
                   @change="changeImage"
                   @change="changeImage"
                   :maxNums="5"
                   :maxNums="5"
-                  :beforeUpload="beforeUpload"
                   listType="picture-card" ></Upload>
                   listType="picture-card" ></Upload>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
@@ -68,13 +68,13 @@
           <a-row :gutter="24">
           <a-row :gutter="24">
             <a-col :span="24">
             <a-col :span="24">
               <a-form-model-item label="备注" prop="remarks" :label-col="{span: 3}" :wrapper-col="{span: 20}">
               <a-form-model-item label="备注" prop="remarks" :label-col="{span: 3}" :wrapper-col="{span: 20}">
-                <a-textarea id="userEdit-remarks" v-model.trim="form.remarks":maxLength="500" allowClear placeholder="请输入备注(最多500个字符)"/>
+                <a-textarea id="addGoodsShelve-remarks" v-model.trim="form.remarks":maxLength="500" allowClear placeholder="请输入备注(最多500个字符)"/>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
           </a-row>
           </a-row>
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
-            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="isshow=false">取消</a-button>
+            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }" id="addGoodsShelve-handleSubmit">保存</a-button>
+            <a-button :style="{ marginLeft: '8px' }" @click="isshow=false" id="addGoodsShelve-close">取消</a-button>
           </a-form-model-item>
           </a-form-model-item>
         </a-form-model>
         </a-form-model>
       </a-spin>
       </a-spin>
@@ -117,7 +117,7 @@ export default {
       },
       },
       form: {
       form: {
         dealerSn: undefined, // 经销商sn
         dealerSn: undefined, // 经销商sn
-        ownerType: '1', // 平台
+        ownerType: 1, // 平台
         storeSn: undefined, // 汽车修理厂sn
         storeSn: undefined, // 汽车修理厂sn
         shelfName: '', // 货架名称
         shelfName: '', // 货架名称
         images: '', // 图片
         images: '', // 图片
@@ -127,7 +127,8 @@ export default {
         shelfName: [ { required: true, message: '请输入用户名称', trigger: 'blur' }, { pattern: '^[^<|>]{1,30}$', message: '请输入不含<或>的字符,最多30个字符' } ],
         shelfName: [ { required: true, message: '请输入用户名称', trigger: 'blur' }, { pattern: '^[^<|>]{1,30}$', message: '请输入不含<或>的字符,最多30个字符' } ],
         dealerSn: [ { required: true, message: '请选择配件经销商', trigger: 'change' } ],
         dealerSn: [ { required: true, message: '请选择配件经销商', trigger: 'change' } ],
         ownerType: [ { required: true, message: '请选择货架归属', trigger: 'change' } ],
         ownerType: [ { required: true, message: '请选择货架归属', trigger: 'change' } ],
-        storeSn: [ { required: true, message: '请选择汽车修理厂', trigger: 'change' } ]
+        storeSn: [ { required: true, message: '请选择汽车修理厂', trigger: 'change' } ],
+        images: [{ required: true, message: '请上传品牌图片', trigger: 'change' } ]
       }
       }
     }
     }
   },
   },
@@ -151,9 +152,6 @@ export default {
     // 产品图片上传
     // 产品图片上传
     changeImage (file) {
     changeImage (file) {
       this.form.images = file
       this.form.images = file
-    },
-    beforeUpload () {
-
     },
     },
     // 改变货架归属
     // 改变货架归属
     changeRadio (e) {
     changeRadio (e) {
@@ -215,13 +213,17 @@ export default {
     },
     },
     isshow (newValue, oldValue) {
     isshow (newValue, oldValue) {
       if (!newValue) {
       if (!newValue) {
-        this.form = {}
+        this.form = {
+          dealerSn: undefined, // 经销商sn
+          ownerType: 1, // 平台
+          storeSn: undefined, // 汽车修理厂sn
+          shelfName: '', // 货架名称
+          images: '', // 图片
+          remarks: ''// 备注
+        }
         this.$refs.ruleForm.resetFields()
         this.$refs.ruleForm.resetFields()
-        this.$emit('close')
         this.titleText = '新增数字货架'
         this.titleText = '新增数字货架'
-      } else {
-        this.titleText = '编辑数字货架'
-        // this.getShelfDetail()
+        this.$emit('close')
       }
       }
     },
     },
     nowData: {
     nowData: {
@@ -241,9 +243,5 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="less">
 <style lang="less">
-.addGoodsShelve-modal{
-  .ant-select-disabled .ant-select-selection{
-    background-color: none !important;
-  }
-}
+
 </style>
 </style>

+ 5 - 10
src/views/numsGoodsShelves/goodsShelvesAdministration/addHWModal.vue

@@ -2,7 +2,7 @@
   <div>
   <div>
     <a-modal
     <a-modal
       centered
       centered
-      wrapClassName="addGoodsShelve-modal"
+      wrapClassName="addHWModal-modal"
       :footer="null"
       :footer="null"
       :maskClosable="false"
       :maskClosable="false"
       :title="textTitle"
       :title="textTitle"
@@ -11,7 +11,7 @@
       :width="500">
       :width="500">
       <a-spin :spinning="spinning" tip="Loading...">
       <a-spin :spinning="spinning" tip="Loading...">
         <a-form-model
         <a-form-model
-          id="userEdit-form"
+          id="addHWModal-form"
           ref="ruleForm"
           ref="ruleForm"
           :model="form"
           :model="form"
           :rules="rules"
           :rules="rules"
@@ -19,13 +19,13 @@
           <a-row :gutter="20">
           <a-row :gutter="20">
             <a-col :span="24">
             <a-col :span="24">
               <a-form-model-item label="货位号" prop="shelfPlaceCode" :label-col="{span: 5}" :wrapper-col="{span: 18}">
               <a-form-model-item label="货位号" prop="shelfPlaceCode" :label-col="{span: 5}" :wrapper-col="{span: 18}">
-                <a-input id="userEdit-shelfPlaceCode" v-model.trim="form.shelfPlaceCode" allowClear placeholder="请输入货位号"/>
+                <a-input id="addHWModal-shelfPlaceCode" v-model.trim="form.shelfPlaceCode" allowClear placeholder="请输入货位号"/>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
           </a-row>
           </a-row>
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
-            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="isshow=false">取消</a-button>
+            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }" id="addHWModal-handleSubmit">保存</a-button>
+            <a-button :style="{ marginLeft: '8px' }" @click="isshow=false" id="addHWModal-close">取消</a-button>
           </a-form-model-item>
           </a-form-model-item>
         </a-form-model>
         </a-form-model>
       </a-spin>
       </a-spin>
@@ -142,9 +142,4 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="less">
 <style lang="less">
-.addGoodsShelve-modal{
-  .ant-select-disabled .ant-select-selection{
-    background-color: none !important;
-  }
-}
 </style>
 </style>

+ 3 - 8
src/views/numsGoodsShelves/goodsShelvesAdministration/changeStatusModal.vue

@@ -2,7 +2,7 @@
   <div>
   <div>
     <a-modal
     <a-modal
       centered
       centered
-      wrapClassName="addGoodsShelve-modal"
+      wrapClassName="changeStatusModal-modal"
       :footer="null"
       :footer="null"
       :maskClosable="false"
       :maskClosable="false"
       :title="titleText"
       :title="titleText"
@@ -19,8 +19,8 @@
             <p>状态流转后无法再回退,请谨慎操作!</p>
             <p>状态流转后无法再回退,请谨慎操作!</p>
           </div>
           </div>
           <div>
           <div>
-            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="isshow=false">取消</a-button>
+            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }" id="changeStatusModal-handleSubmit">保存</a-button>
+            <a-button :style="{ marginLeft: '8px' }" @click="isshow=false" id="changeStatusModal-close">取消</a-button>
           </div>
           </div>
         </div>
         </div>
       </a-spin>
       </a-spin>
@@ -100,9 +100,4 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="less">
 <style lang="less">
-.addGoodsShelve-modal{
-  .ant-select-disabled .ant-select-selection{
-    background-color: none !important;
-  }
-}
 </style>
 </style>

+ 0 - 27
src/views/numsGoodsShelves/goodsShelvesAdministration/chooseImportModal.vue

@@ -54,13 +54,6 @@
           class="button-cancel"
           class="button-cancel"
           @click="isShow=false"
           @click="isShow=false"
           style="padding: 0 40px;margin-left: 15px;">取消</a-button>
           style="padding: 0 40px;margin-left: 15px;">取消</a-button>
-        <!-- <a-button
-          type="primary"
-          id="chooseImport-error"
-          size="large"
-          class="button-error"
-          @click="handleError"
-          style="padding: 0 40px;margin-left: 15px;">导出错误项</a-button> -->
       </div>
       </div>
     </div>
     </div>
   </a-modal>
   </a-modal>
@@ -111,7 +104,6 @@ export default {
       exportExcelData(params).then(res => {
       exportExcelData(params).then(res => {
         this.loading = false
         this.loading = false
         if (res.status == 200) {
         if (res.status == 200) {
-          console.log(res, '-------货位')
           if (res.data.successList && res.data.successList.length > 0) {
           if (res.data.successList && res.data.successList.length > 0) {
             res.data.successList.map((item, index) => {
             res.data.successList.map((item, index) => {
               item.no = index + 1
               item.no = index + 1
@@ -132,32 +124,13 @@ export default {
       if (this.loadData.length == 0) {
       if (this.loadData.length == 0) {
         this.$message.warning('无可导入产品!')
         this.$message.warning('无可导入产品!')
       } else {
       } else {
-        // this.$emit('ok', this.loadData)
-        // this.isShow = false
-        // const params = this.loadData
         saveBatchExcel(this.loadData).then(res => {
         saveBatchExcel(this.loadData).then(res => {
           if (res.status == 200) {
           if (res.status == 200) {
-            console.log(res, '----------huoweo')
             this.$emit('ok', this.loadData)
             this.$emit('ok', this.loadData)
             this.isShow = false
             this.isShow = false
           }
           }
         })
         })
       }
       }
-    },
-    // 导出
-    handleError () {
-      // const _this = this
-      // if (_this.unLoadData.length < 1) {
-      //   _this.$message.info('暂无可导出错误项~')
-      //   return
-      // }
-      // _this.spinning = true
-      // const params = {
-      //   list: _this.unLoadData
-      // }
-      // hdExportExcel(sparePartsDetailFailExcel, params, '产品导入错误项', function () {
-      //   _this.spinning = false
-      // })
     }
     }
   },
   },
   watch: {
   watch: {

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

@@ -3,7 +3,7 @@
     <a-spin :spinning="spinning" tip="Loading...">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="goodsAllocationSet-baseInfo">
       <a-page-header :ghost="false" :backIcon="false" class="goodsAllocationSet-baseInfo">
         <template slot="subTitle">
         <template slot="subTitle">
-          <a href="javascript:;" @click="handleBack">
+          <a href="javascript:;" @click="handleBack" id="goodsAllocationSet-handleBack">
             <a-icon type="left"></a-icon> 返回列表
             <a-icon type="left"></a-icon> 返回列表
           </a>
           </a>
           <span style="margin: 0 15px;color: #666;font-weight: bold;">{{ pageInfo&&pageInfo.shelfName?pageInfo.shelfName:'--' }}</span>
           <span style="margin: 0 15px;color: #666;font-weight: bold;">{{ pageInfo&&pageInfo.shelfName?pageInfo.shelfName:'--' }}</span>
@@ -29,7 +29,7 @@
       </a-card>
       </a-card>
       <a-card :bordered="false" size="small" class="pages-wrap">
       <a-card :bordered="false" size="small" class="pages-wrap">
         <div class="goodsAllocationSet-baseInfo">
         <div class="goodsAllocationSet-baseInfo">
-          <a-button @click="pageInfo&&pageInfo.state=='NOT_ENABLE'? addHW(0,pageInfo):addHW(1,pageInfo)" type="primary">{{ pageInfo&&pageInfo.state=='NOT_ENABLE'? '批量导入货位':'新增' }}</a-button>
+          <a-button id="goodsAllocationSet-addHW" @click="pageInfo&&pageInfo.state=='NOT_ENABLE'? addHW(0,pageInfo):addHW(1,pageInfo)" type="primary">{{ pageInfo&&pageInfo.state=='NOT_ENABLE'? '批量导入货位':'新增' }}</a-button>
         </div>
         </div>
         <a-table
         <a-table
           class="sTable fixPagination"
           class="sTable fixPagination"
@@ -40,8 +40,8 @@
           :data-source="loadData"
           :data-source="loadData"
           bordered>
           bordered>
           <template slot="status" slot-scope="text, record">
           <template slot="status" slot-scope="text, record">
-            <a-button size="small" type="link" @click="handleEdit(record)" v-if="pageInfo&&pageInfo.state=='NOT_ENABLE' && !record.productCode">编辑</a-button>
-            <a-button size="small" type="link" @click="handleDel(record)" v-if="pageInfo&&pageInfo.state=='NOT_ENABLE' && !record.productCode">删除</a-button>
+            <a-button size="small" type="link" id="goodsAllocationSet-handleEdit" @click="handleEdit(record)" v-if="pageInfo&&pageInfo.state=='NOT_ENABLE' && !record.productCode">编辑</a-button>
+            <a-button size="small" type="link" id="goodsAllocationSet-handleDel" @click="handleDel(record)" v-if="pageInfo&&pageInfo.state=='NOT_ENABLE' && !record.productCode">删除</a-button>
             <span v-if="pageInfo&&pageInfo.state!='NOT_ENABLE'" style="display: inline-block;padding-left: 7px;">--</span>
             <span v-if="pageInfo&&pageInfo.state!='NOT_ENABLE'" style="display: inline-block;padding-left: 7px;">--</span>
             <!-- <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> -->
             <!-- <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>
           </template>

+ 10 - 26
src/views/numsGoodsShelves/goodsShelvesAdministration/importHuoweiModal.vue

@@ -1,14 +1,14 @@
 <template>
 <template>
   <a-modal
   <a-modal
     centered
     centered
-    class="importGuide-modal"
+    class="importHuoweiModal-modal"
     :footer="null"
     :footer="null"
     :maskClosable="false"
     :maskClosable="false"
     title="批量导入货位"
     title="批量导入货位"
     v-model="isShow"
     v-model="isShow"
     @cancle="isShow=false"
     @cancle="isShow=false"
     :width="750">
     :width="750">
-    <div class="importGuide-con">
+    <div class="importHuoweiModal-con">
       <div class="explain-con">
       <div class="explain-con">
         <div class="explain-item">
         <div class="explain-item">
           <div class="explain-tit">
           <div class="explain-tit">
@@ -17,7 +17,6 @@
             <a :href="filePath" style="padding: 5px 0 0 23px;display: block;">
             <a :href="filePath" style="padding: 5px 0 0 23px;display: block;">
               <a-icon type="download" style="padding-right: 5px;" />下载导入模板
               <a-icon type="download" style="padding-right: 5px;" />下载导入模板
             </a>
             </a>
-            <!-- <a-button type="link" icon="download" style="padding: 0 0 0 23px;" @click="handleExport">下载导入模板</a-button> -->
           </div>
           </div>
         </div>
         </div>
         <div class="explain-item">
         <div class="explain-item">
@@ -38,7 +37,7 @@
           <p>目前支持的文件类型*.xls,*.xlsx.</p>
           <p>目前支持的文件类型*.xls,*.xlsx.</p>
           <div style="overflow: hidden;padding-left: 23px;">
           <div style="overflow: hidden;padding-left: 23px;">
             <Upload
             <Upload
-              id="importGuide-attachList"
+              id="importHuoweiModal-attachList"
               ref="importUpload"
               ref="importUpload"
               :maxNums="1"
               :maxNums="1"
               fileType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
               fileType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel"
@@ -54,13 +53,13 @@
       <div class="btn-con">
       <div class="btn-con">
         <a-button
         <a-button
           type="primary"
           type="primary"
-          id="importGuide-nextStep"
+          id="importHuoweiModal-nextStep"
           size="large"
           size="large"
           class="button-primary"
           class="button-primary"
           @click="handlerNextStep"
           @click="handlerNextStep"
           style="padding: 0 60px;">下一步</a-button>
           style="padding: 0 60px;">下一步</a-button>
         <a-button
         <a-button
-          id="importGuide-cancel"
+          id="importHuoweiModal-cancel"
           size="large"
           size="large"
           class="button-cancel"
           class="button-cancel"
           @click="isShow=false"
           @click="isShow=false"
@@ -75,10 +74,8 @@
 <script>
 <script>
 import ChooseImportModal from './chooseImportModal.vue'
 import ChooseImportModal from './chooseImportModal.vue'
 import { Upload } from '@/components'
 import { Upload } from '@/components'
-import { hdExportExcel } from '@/libs/exportExcel'
-import { shelfHWExport } from '@/api/shelf'
 export default {
 export default {
-  name: 'ImportGuideModal',
+  name: 'ImportHuoweiModalModal',
   components: { ChooseImportModal, Upload },
   components: { ChooseImportModal, Upload },
   props: {
   props: {
     openModal: { //  弹框显示状态
     openModal: { //  弹框显示状态
@@ -94,7 +91,7 @@ export default {
     return {
     return {
       isShow: this.openModal, //  是否打开弹框
       isShow: this.openModal, //  是否打开弹框
       openImportModal: false, //  导入
       openImportModal: false, //  导入
-      filePath: 'https://jg-ocs-test.oss-cn-beijing.aliyuncs.com/test/%E6%95%B0%E5%AD%97%E8%B4%A7%E6%9E%B6%E8%B4%A7%E4%BD%8D%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx',
+      filePath: 'https://jg-ocs-test.oss-cn-beijing.aliyuncs.com/test/%E6%95%B0%E5%AD%97%E8%B4%A7%E6%9E%B6%E8%B4%A7%E4%BD%8D%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx', // 文件地址
       attachAction: process.env.VUE_APP_API_BASE_URL + '/upload',
       attachAction: process.env.VUE_APP_API_BASE_URL + '/upload',
       paramsData: null,
       paramsData: null,
       uploadParams: {
       uploadParams: {
@@ -105,7 +102,6 @@ export default {
   methods: {
   methods: {
     // 下一步
     // 下一步
     handlerNextStep () {
     handlerNextStep () {
-      this.openImportModal = true
       if (this.paramsData) {
       if (this.paramsData) {
         this.openImportModal = true
         this.openImportModal = true
       } else {
       } else {
@@ -124,7 +120,6 @@ export default {
     },
     },
     // 导入
     // 导入
     hanldeOk (obj) {
     hanldeOk (obj) {
-      console.log(obj, 'obj2222222222222')
       if (obj && obj.length > 0) {
       if (obj && obj.length > 0) {
         this.$emit('ok', obj)
         this.$emit('ok', obj)
         this.isShow = false
         this.isShow = false
@@ -134,17 +129,6 @@ export default {
     handleClose () {
     handleClose () {
       this.openImportModal = false
       this.openImportModal = false
       this.isShow = false
       this.isShow = false
-    },
-    //  导出
-    handleExport () {
-      // const _this = this
-      const params = { }
-      // this.exportLoading = true
-      // this.spinning = true
-      hdExportExcel(shelfHWExport, params, '货位导入模板', function () {
-        // _this.exportLoading = false
-        // _this.spinning = false
-      })
     }
     }
   },
   },
   watch: {
   watch: {
@@ -165,8 +149,8 @@ export default {
 </script>
 </script>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
-  .importGuide-modal{
-    .importGuide-con{
+  .importHuoweiModal-modal{
+    .importHuoweiModal-con{
       .explain-con{
       .explain-con{
         .explain-item{
         .explain-item{
           margin-bottom: 10px;
           margin-bottom: 10px;
@@ -197,7 +181,7 @@ export default {
             }
             }
           }
           }
         }
         }
-        #importGuide-attachList{
+        #importHuoweiModal-attachList{
           width: 100%;
           width: 100%;
         }
         }
       }
       }

+ 13 - 13
src/views/numsGoodsShelves/goodsShelvesAdministration/list.vue

@@ -6,34 +6,34 @@
           <a-row :gutter="15">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="货架名称">
               <a-form-item label="货架名称">
-                <a-input id="userList-shelfName" allowClear v-model.trim="queryParam.shelfName" placeholder="请输入货架名称"/>
+                <a-input id="goodsShelvesAdministrationList-shelfName" allowClear v-model.trim="queryParam.shelfName" placeholder="请输入货架名称"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="配件经销商">
               <a-form-item label="配件经销商">
-                <dealerList ref="dealerList" @change="dealerChange" :itemSn="queryParam.dealerSn"></dealerList>
+                <dealerList ref="dealerList" @change="dealerChange" id="goodsShelvesAdministrationList-dealerChange"></dealerList>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="汽车修理厂">
               <a-form-item label="汽车修理厂">
-                <storeList ref="storeList" @change="storeChange" :itemSn="queryParam.storeSn"></storeList>
+                <storeList ref="storeList" @change="storeChange" id="goodsShelvesAdministrationList-storeChange"></storeList>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <template v-if="advanced">
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="货架状态">
                 <a-form-item label="货架状态">
-                  <v-select id="userList-loginFlag" code="SHELF_STATE" v-model="queryParam.shelfState" allowClear placeholder="请选择状态"></v-select>
+                  <v-select id="goodsShelvesAdministrationList-shelfState" code="SHELF_STATE" v-model="queryParam.shelfState" allowClear placeholder="请选择状态"></v-select>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="结算状态">
                 <a-form-item label="结算状态">
-                  <v-select id="userList-loginFlag" code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择状态"></v-select>
+                  <v-select id="goodsShelvesAdministrationList-settleType" code="SHELF_SETTLE_TYPE" v-model="queryParam.settleType" allowClear placeholder="请选择状态"></v-select>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
             </template>
             </template>
             <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
             <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" id="userList-search">查询</a-button>
-              <a-button type="" @click="reset" id="userList-reset" style="margin-left: 10px;">重置</a-button>
+              <a-button type="primary" @click="$refs.table.refresh(true)" id="goodsShelvesAdministrationList-search">查询</a-button>
+              <a-button type="" @click="reset" id="goodsShelvesAdministrationList-reset" style="margin-left: 10px;">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -43,7 +43,7 @@
         </a-form>
         </a-form>
       </div>
       </div>
       <div class="table-operator">
       <div class="table-operator">
-        <a-button size="small" type="primary" class="button-error" @click="handleEdit()">新增数字货架</a-button>
+        <a-button size="small" type="primary" class="button-error" @click="handleEdit()" id="goodsShelvesAdministrationList-handleEdit">新增数字货架</a-button>
       </div>
       </div>
       <s-table
       <s-table
         class="sTable fixPagination"
         class="sTable fixPagination"
@@ -57,12 +57,12 @@
         :defaultLoadData="false"
         :defaultLoadData="false"
         bordered>
         bordered>
         <template slot="state" slot-scope="text, record">
         <template slot="state" slot-scope="text, record">
-          <div @click="changeFlagHandle(record)" style="cursor:pointer;">{{ record.stateDictValue }}<a-icon v-if="record.state!='CLOSE'" type="edit" title="编辑" :style="{color:' #1890FF',paddingLeft: '5px'}"/></div>
+          <div @click="changeFlagHandle(record)" style="cursor:pointer;" id="goodsShelvesAdministrationList-changeFlagHandle">{{ record.stateDictValue }}<a-icon v-if="record.state!='CLOSE'" type="edit" title="编辑" :style="{color:' #1890FF',paddingLeft: '5px'}"/></div>
         </template>
         </template>
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
-          <a-button size="small" type="link" class="button-info" @click="handleEdit(record)">编辑</a-button>
-          <a-button size="small" type="link" class="button-info" @click="handleSet(record)">货位设置</a-button>
-          <a-button size="small" type="link" class="button-info" @click="handleSettlement(record)">结算设置</a-button>
+          <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="goodsShelvesAdministrationList-handleEdit">编辑</a-button>
+          <a-button size="small" type="link" class="button-info" @click="handleSet(record)" id="goodsShelvesAdministrationList-handleSet">货位设置</a-button>
+          <a-button size="small" type="link" class="button-info" @click="handleSettlement(record)" id="goodsShelvesAdministrationList-handleSettlement">结算设置</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> -->
           <!-- <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>
         </template>
       </s-table>
       </s-table>
@@ -107,7 +107,7 @@ export default {
         { title: '货架名称', dataIndex: 'shelfName', width: '17%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '货架名称', dataIndex: 'shelfName', width: '17%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '配件经销商', dataIndex: 'dealerEntity.dealerName', width: '17%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '配件经销商', dataIndex: 'dealerEntity.dealerName', width: '17%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '汽车修理厂', dataIndex: 'storeName', width: '17%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '汽车修理厂', dataIndex: 'storeName', width: '17%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '货位数量', dataIndex: 'shelfPlaceNum', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '货位数量', dataIndex: 'shelfPlaceNum', width: '7%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '结算方式', dataIndex: 'settleTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '结算方式', dataIndex: 'settleTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: <div>货架状态&nbsp;<a-tooltip placement='top' title='货架状态'><a-icon type="question-circle" /></a-tooltip></div>, width: '7%', align: 'center', scopedSlots: { customRender: 'state' } },
         { title: <div>货架状态&nbsp;<a-tooltip placement='top' title='货架状态'><a-icon type="question-circle" /></a-tooltip></div>, width: '7%', align: 'center', scopedSlots: { customRender: 'state' } },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },

+ 55 - 46
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementModifyModal.vue

@@ -1,17 +1,17 @@
 <template>
 <template>
   <div>
   <div>
-    <a-spin :spinning="spinning" tip="Loading...">
-      <a-modal
-        centered
-        wrapClassName="addGoodsShelve-modal"
-        :footer="null"
-        :maskClosable="false"
-        title="修改结算方式"
-        v-model="isshow"
-        @cancle="isshow=false"
-        :width="650">
+    <a-modal
+      centered
+      wrapClassName="settlementModifyModal-modal"
+      :footer="null"
+      :maskClosable="false"
+      title="修改结算方式"
+      v-model="isshow"
+      @cancle="isshow=false"
+      :width="650">
+      <a-spin :spinning="spinning" tip="Loading...">
         <a-form-model
         <a-form-model
-          id="userEdit-form"
+          id="settlementModifyModal-form"
           ref="ruleForm"
           ref="ruleForm"
           :model="form"
           :model="form"
           :rules="rules"
           :rules="rules"
@@ -29,7 +29,7 @@
                 <a-select
                 <a-select
                   style="background-color: none;"
                   style="background-color: none;"
                   placeholder="请选择结算方式"
                   placeholder="请选择结算方式"
-                  id="settleType"
+                  id="settlementModifyModal-settleType"
                   allowClear
                   allowClear
                   v-model="form.settleType"
                   v-model="form.settleType"
                 >
                 >
@@ -41,7 +41,7 @@
               <a-col :span="20">
               <a-col :span="20">
                 <a-form-model-item label="授信额度" prop="creditLimit">
                 <a-form-model-item label="授信额度" prop="creditLimit">
                   <a-input-number
                   <a-input-number
-                    id="shelfSet-bindProduct-creditLimit"
+                    id="settlementModifyModal-creditLimit"
                     v-model="form.creditLimit"
                     v-model="form.creditLimit"
                     :precision="2"
                     :precision="2"
                     :min="0.01"
                     :min="0.01"
@@ -53,23 +53,27 @@
               <a-col :span="4"> <span style="display: inline-block; padding: 10px;">元</span></a-col>
               <a-col :span="4"> <span style="display: inline-block; padding: 10px;">元</span></a-col>
             </a-row>
             </a-row>
             <a-col :span="20" v-if="form.settleType=='MONTH'">
             <a-col :span="20" v-if="form.settleType=='MONTH'">
-              <a-form-model-item label="结算日期(每月)" prop="settleDay" >
-                <a-select
-                  style="background-color: none;"
-                  placeholder="请选择结算日期"
-                  id="userSyncEdit-settleDay"
-                  allowClear
-                  v-model="form.settleDay"
-                >
-                  <a-select-option v-for="item in dateList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
-                </a-select>
+              <a-form-model-item label="结算日期" prop="settleDay" >
+                <div style="display: flex;padding: 0;align-items: center;">
+                  <span style="display: inline-block;margin-right: 10px;">每月</span>
+                  <a-select
+                    style="background-color: none;width: 65%"
+                    placeholder="请选择结算日期"
+                    id="settlementModifyModal-settleDay"
+                    allowClear
+                    v-model="form.settleDay"
+                  >
+                    <a-select-option v-for="item in dateList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+                  </a-select>
+                  <span style="display: inline-block;margin-left: 10px;">号</span>
+                </div>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <a-row v-if="form.settleType=='CREDIT'">
             <a-row v-if="form.settleType=='CREDIT'">
               <a-col :span="20">
               <a-col :span="20">
                 <a-form-model-item label="结算提醒金额" prop="creditWarnLimit" >
                 <a-form-model-item label="结算提醒金额" prop="creditWarnLimit" >
                   <a-input-number
                   <a-input-number
-                    id="shelfSet-bindProduct-creditWarnLimit"
+                    id="settlementModifyModal-creditWarnLimit"
                     v-model="form.creditWarnLimit"
                     v-model="form.creditWarnLimit"
                     :precision="2"
                     :precision="2"
                     :min="0.01"
                     :min="0.01"
@@ -81,33 +85,37 @@
               <a-col :span="4"> <span style="display: inline-block; padding: 10px;">元</span></a-col>
               <a-col :span="4"> <span style="display: inline-block; padding: 10px;">元</span></a-col>
             </a-row>
             </a-row>
             <a-col :span="20" v-if="form.settleType=='MONTH'">
             <a-col :span="20" v-if="form.settleType=='MONTH'">
-              <a-form-model-item label="结算提醒(每月提醒提前的天数)" prop="warnBeforeDays" >
-                <a-select
-                  style="background-color: none;"
-                  placeholder="请选择结算提醒日期"
-                  id="userSyncEdit-warnBeforeDays"
-                  allowClear
-                  v-model="form.warnBeforeDays"
-                >
-                  <a-select-option v-for="item in dateTXList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
-                </a-select>
+              <a-form-model-item label="结算提醒" prop="warnBeforeDays" >
+                <div style="display: flex;padding: 0;align-items: center;">
+                  <span style="display: inline-block;margin-right: 10px;">提前</span>
+                  <a-select
+                    style="background-color: none;width: 65%;"
+                    placeholder="请选择结算提醒日期"
+                    id="settlementModifyModal-warnBeforeDays"
+                    allowClear
+                    v-model="form.warnBeforeDays"
+                  >
+                    <a-select-option v-for="item in dateTXList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+                  </a-select>
+                  <span style="display: inline-block;margin-left: 10px;">天开始提醒</span>
+                </div>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <a-col :span="20">
             <a-col :span="20">
               <a-form-model-item :label="form.settleType=='CREDIT'?'超过授信额度':'超期未结算'" v-if="form.settleType">
               <a-form-model-item :label="form.settleType=='CREDIT'?'超过授信额度':'超期未结算'" v-if="form.settleType">
-                <a-checkbox @change="onChange">
+                <a-checkbox @change="onChange" id="settlementModifyModal-onChange" :checked="form.limitFlag==1">
                   限制汽车修理厂无法使用数字货架
                   限制汽车修理厂无法使用数字货架
                 </a-checkbox>
                 </a-checkbox>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
           </a-row>
           </a-row>
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
           <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
-            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">保存</a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="handleBack">取消</a-button>
+            <a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }" id="settlementModifyModal-handleSubmit">保存</a-button>
+            <a-button :style="{ marginLeft: '8px' }" @click="handleBack" id="settlementModifyModal-handleBack">取消</a-button>
           </a-form-model-item>
           </a-form-model-item>
         </a-form-model>
         </a-form-model>
-      </a-modal>
-    </a-spin>
+      </a-spin>
+    </a-modal>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -153,8 +161,8 @@ export default {
         settleType: undefined, // 结算方式
         settleType: undefined, // 结算方式
         creditLimit: '', // 授信额度
         creditLimit: '', // 授信额度
         creditWarnLimit: '', // 结算提醒金额
         creditWarnLimit: '', // 结算提醒金额
-        settleDay: '', // 每月结算日
-        warnBeforeDays: '', // 结算提醒提前天数
+        settleDay: undefined, // 每月结算日
+        warnBeforeDays: undefined, // 结算提醒提前天数
         limitFlag: '' // 是否限制使用
         limitFlag: '' // 是否限制使用
       },
       },
       rules: {
       rules: {
@@ -175,9 +183,9 @@ export default {
       str = str.replace(/[\r\n]/g, '')
       str = str.replace(/[\r\n]/g, '')
       this.form.name = str
       this.form.name = str
     },
     },
-    // 产品图片上传
+    //
     onChange (e) {
     onChange (e) {
-      console.log(e.target.checked)
+      console.log(e.target.checked, '============')
       if (e.target.checked) {
       if (e.target.checked) {
         this.form.limitFlag = 1
         this.form.limitFlag = 1
       } else {
       } else {
@@ -195,6 +203,7 @@ export default {
       this.$refs.ruleForm.validate(valid => {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
         if (valid) {
           const params = JSON.parse(JSON.stringify(_this.form))
           const params = JSON.parse(JSON.stringify(_this.form))
+          console.log(params, 'params.limitFlag')
           if (params.limitFlag == '') {
           if (params.limitFlag == '') {
             params.limitFlag = 0
             params.limitFlag = 0
           }
           }
@@ -247,9 +256,9 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="less">
 <style lang="less">
-.addGoodsShelve-modal{
-  .ant-select-disabled .ant-select-selection{
-    background-color: none !important;
+.settlementModifyModal-modal{
+  .ant-input-number-handler-wrap{
+    display: none;
   }
   }
 }
 }
 </style>
 </style>

+ 65 - 41
src/views/numsGoodsShelves/goodsShelvesAdministration/settlementSet.vue

@@ -1,15 +1,15 @@
 <template>
 <template>
-  <div class="goodsAllocationSet-page">
+  <div class="settlementSet-page">
     <a-spin :spinning="spinning" tip="Loading...">
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-page-header :ghost="false" :backIcon="false" class="goodsAllocationSet-baseInfo">
+      <a-page-header :ghost="false" :backIcon="false" class="settlementSet-baseInfo">
         <template slot="subTitle">
         <template slot="subTitle">
-          <a href="javascript:;" @click="handleBack">
+          <a href="javascript:;" @click="handleBack" id="settlementSet-handleBack">
             <a-icon type="left"></a-icon> 返回列表
             <a-icon type="left"></a-icon> 返回列表
           </a>
           </a>
           <span style="margin: 0 15px;color: #666;font-weight: bold;">{{ pageInfo&&pageInfo.shelfName?pageInfo.shelfName:'--' }}</span>
           <span style="margin: 0 15px;color: #666;font-weight: bold;">{{ pageInfo&&pageInfo.shelfName?pageInfo.shelfName:'--' }}</span>
         </template>
         </template>
       </a-page-header>
       </a-page-header>
-      <a-card :bordered="false" size="small" class="goodsAllocationSet-baseInfo">
+      <a-card :bordered="false" size="small" class="settlementSet-baseInfo">
         <a-collapse :activeKey="['1']">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions size="small" :column="3">
             <a-descriptions size="small" :column="3">
@@ -39,8 +39,8 @@
               :defaultLoadData="true"
               :defaultLoadData="true"
               bordered>
               bordered>
               <template slot="status" slot-scope="text, record">
               <template slot="status" slot-scope="text, record">
-                <a-button type="link" @click="handleEdit(record)">编辑</a-button>
-                <a-button type="link" @click="handleDel(record)">删除</a-button>
+                <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> -->
               <!-- <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>
               </template>
             </s-table>
             </s-table>
@@ -48,9 +48,9 @@
         </a-collapse>
         </a-collapse>
       </a-card>
       </a-card>
       <a-card :bordered="false" size="small" class="pages-wrap">
       <a-card :bordered="false" size="small" class="pages-wrap">
-        <div class="goodsAllocationSet-baseInfo">
+        <div class="settlementSet-baseInfo">
           <a-form-model
           <a-form-model
-            id="userEdit-form"
+            id="settlementSet-form"
             ref="ruleForm"
             ref="ruleForm"
             :model="form"
             :model="form"
             :rules="rules"
             :rules="rules"
@@ -62,6 +62,7 @@
                 <a-col :span="15">
                 <a-col :span="15">
                   <a-form-model-item label="结算方式" prop="settleType">
                   <a-form-model-item label="结算方式" prop="settleType">
                     <v-select
                     <v-select
+                      id="settlementSet-settleType"
                       code="SHELF_SETTLE_TYPE"
                       code="SHELF_SETTLE_TYPE"
                       v-model="form.settleType"
                       v-model="form.settleType"
                       allowClear
                       allowClear
@@ -70,13 +71,19 @@
                     </v-select>
                     </v-select>
                   </a-form-model-item>
                   </a-form-model-item>
                 </a-col>
                 </a-col>
-                <a-col :span="1"><a-button size="small" type="link" @click="handleModify(pageInfo,settleInfo)" v-if="pageInfo&&pageInfo.settleType" style="padding-top: 10px;">修改</a-button></a-col>
+                <a-col :span="1"><a-button
+                  size="small"
+                  type="link"
+                  id="settlementSet-handleModify"
+                  @click="handleModify(pageInfo,settleInfo)"
+                  v-if="pageInfo&&pageInfo.settleType"
+                  style="padding-top: 10px;">修改</a-button></a-col>
               </a-row>
               </a-row>
               <a-row v-if="form.settleType=='CREDIT'">
               <a-row v-if="form.settleType=='CREDIT'">
                 <a-col :span="15">
                 <a-col :span="15">
                   <a-form-model-item label="授信额度" prop="creditLimit">
                   <a-form-model-item label="授信额度" prop="creditLimit">
                     <a-input-number
                     <a-input-number
-                      id="shelfSet-bindProduct-creditLimit"
+                      id="settlementSet-creditLimit"
                       v-model="form.creditLimit"
                       v-model="form.creditLimit"
                       :precision="2"
                       :precision="2"
                       :min="0.01"
                       :min="0.01"
@@ -88,23 +95,28 @@
                 <a-col :span="1"> <span style="display: inline-block; padding: 10px;">元</span></a-col>
                 <a-col :span="1"> <span style="display: inline-block; padding: 10px;">元</span></a-col>
               </a-row>
               </a-row>
               <a-col :span="15">
               <a-col :span="15">
-                <a-form-model-item label="结算日期(每月)" prop="settleDay" v-if="form.settleType=='MONTH'">
-                  <a-select
-                    style="background-color: none;"
-                    placeholder="请选择结算日期"
-                    id="userSyncEdit-settleDay"
-                    allowClear
-                    v-model="form.settleDay"
-                  >
-                    <a-select-option v-for="item in dateList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
-                  </a-select>
+                <a-form-model-item label="结算日期" prop="settleDay" v-if="form.settleType=='MONTH'">
+                  <div style="display: flex;padding: 0;align-items: center;">
+                    <span style="display: inline-block;margin-right: 10px;">每月</span>
+                    <a-select
+                      style="background-color: none;width: 65%;"
+                      placeholder="请选择结算日期"
+                      id="settlementSet-settleDay"
+                      allowClear
+                      v-model="form.settleDay"
+                    >
+                      <a-select-option v-for="item in dateList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+                    </a-select>
+                    <span style="display: inline-block;margin-left: 10px;">号</span>
+                  </div>
+
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
               <a-row v-if="form.settleType=='CREDIT'">
               <a-row v-if="form.settleType=='CREDIT'">
                 <a-col :span="15">
                 <a-col :span="15">
                   <a-form-model-item label="结算提醒金额" prop="creditWarnLimit" >
                   <a-form-model-item label="结算提醒金额" prop="creditWarnLimit" >
                     <a-input-number
                     <a-input-number
-                      id="shelfSet-bindProduct-creditWarnLimit"
+                      id="settlementSet-creditWarnLimit"
                       v-model="form.creditWarnLimit"
                       v-model="form.creditWarnLimit"
                       :precision="2"
                       :precision="2"
                       :min="0.01"
                       :min="0.01"
@@ -116,28 +128,32 @@
                 <a-col :span="1"> <span style="display: inline-block; padding: 10px;">元</span></a-col>
                 <a-col :span="1"> <span style="display: inline-block; padding: 10px;">元</span></a-col>
               </a-row>
               </a-row>
               <a-col :span="15">
               <a-col :span="15">
-                <a-form-model-item label="结算提醒(每月提醒提前的天数)" prop="warnBeforeDays" v-if="form.settleType=='MONTH'">
-                  <a-select
-                    style="background-color: none;"
-                    placeholder="请选择结算提醒日期"
-                    id="userSyncEdit-warnBeforeDays"
-                    allowClear
-                    v-model="form.warnBeforeDays"
-                  >
-                    <a-select-option v-for="item in dateTXList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
-                  </a-select>
+                <a-form-model-item label="结算提醒" prop="warnBeforeDays" v-if="form.settleType=='MONTH'">
+                  <div style="display: flex;padding: 0;align-items: center;">
+                    <span style="display: inline-block;margin-right: 10px;">提前</span>
+                    <a-select
+                      style="background-color: none;width: 65%;"
+                      placeholder="请选择结算提醒日期"
+                      id="settlementSet-warnBeforeDays"
+                      allowClear
+                      v-model="form.warnBeforeDays"
+                    >
+                      <a-select-option v-for="item in dateTXList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+                    </a-select>
+                    <span style="display: inline-block;margin-left: 10px;">天开始提醒</span>
+                  </div>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
               <a-col :span="15" v-if="form.settleType">
               <a-col :span="15" v-if="form.settleType">
                 <a-form-model-item :label="form.settleType=='CREDIT'?'超过授信额度':'超期未结算'">
                 <a-form-model-item :label="form.settleType=='CREDIT'?'超过授信额度':'超期未结算'">
-                  <a-checkbox @change="onChange" >
+                  <a-checkbox @change="onChange" id="settlementSet-settleType" :checked="form.limitFlag==1">
                     限制汽车修理厂无法使用数字货架
                     限制汽车修理厂无法使用数字货架
                   </a-checkbox>
                   </a-checkbox>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
               <a-col :span="15" v-if="pageInfo&&!pageInfo.settleType &&form.settleType ">
               <a-col :span="15" v-if="pageInfo&&!pageInfo.settleType &&form.settleType ">
                 <a-form-model-item label="是否需要缴纳保证金" prop="bondFlag" >
                 <a-form-model-item label="是否需要缴纳保证金" prop="bondFlag" >
-                  <a-radio-group name="radioGroup" v-model="form.bondFlag" @change="changeRadio">
+                  <a-radio-group name="radioGroup" v-model="form.bondFlag" @change="changeRadio" id="settlementSet-bondFlag">
                     <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>
@@ -147,7 +163,7 @@
                 <a-col :span="15">
                 <a-col :span="15">
                   <a-form-model-item label="保证金缴纳金额" prop="bondAmount" >
                   <a-form-model-item label="保证金缴纳金额" prop="bondAmount" >
                     <a-input-number
                     <a-input-number
-                      id="shelfSet-bindProduct-bondAmount"
+                      id="settlementSet-bondAmount"
                       v-model="form.bondAmount"
                       v-model="form.bondAmount"
                       :precision="2"
                       :precision="2"
                       :min="0.01"
                       :min="0.01"
@@ -160,7 +176,7 @@
               </a-row>
               </a-row>
             </a-row>
             </a-row>
             <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
             <a-form-model-item :label-col="{span: 0}" :wrapper-col="{span: 24}" style="text-align: center;">
-              <a-button type="primary" @click="handleSubmit" >保存</a-button>
+              <a-button type="primary" @click="handleSubmit" id="settlementSet-handleSubmit">保存</a-button>
             </a-form-model-item>
             </a-form-model-item>
           </a-form-model>
           </a-form-model>
         </div>
         </div>
@@ -193,11 +209,11 @@ export default {
       settlementType: '', // 结算方式
       settlementType: '', // 结算方式
       pageInfo: null,
       pageInfo: null,
       form: {
       form: {
-        settleType: '', // 结算方式
+        settleType: undefined, // 结算方式
         creditLimit: '', // 授信额度
         creditLimit: '', // 授信额度
         creditWarnLimit: '', // 结算提醒金额
         creditWarnLimit: '', // 结算提醒金额
-        settleDay: '', // 每月结算日
-        warnBeforeDays: '', // 结算提醒提前天数
+        settleDay: undefined, // 每月结算日
+        warnBeforeDays: undefined, // 结算提醒提前天数
         limitFlag: '', // 是否限制使用
         limitFlag: '', // 是否限制使用
         bondFlag: '', // 是否缴纳保证金
         bondFlag: '', // 是否缴纳保证金
         bondAmount: '' // 保证金金额
         bondAmount: '' // 保证金金额
@@ -242,8 +258,9 @@ export default {
   },
   },
   methods: {
   methods: {
     handleBack () {
     handleBack () {
-      this.$refs.ruleForm.resetFields()
+      this.isEdit = false
       this.form = {}
       this.form = {}
+      this.$refs.ruleForm.resetFields()
       this.$router.push({ path: '/numsGoodsShelves/goodsShelvesAdministration/list' })
       this.$router.push({ path: '/numsGoodsShelves/goodsShelvesAdministration/list' })
       // this.$router.go(-1)
       // this.$router.go(-1)
     },
     },
@@ -300,6 +317,8 @@ export default {
         settleRuleDetail({ shelfSn: this.pageInfo.shelfSn, settleType: this.settlementType }).then(res => {
         settleRuleDetail({ shelfSn: this.pageInfo.shelfSn, settleType: this.settlementType }).then(res => {
           if (res.status == 200) {
           if (res.status == 200) {
             this.form = Object.assign({}, res.data)
             this.form = Object.assign({}, res.data)
+            this.form.limitFlag = Number(this.form.limitFlag)
+
             this.settleInfo = res.data
             this.settleInfo = res.data
           } else {
           } else {
             this.form = {}
             this.form = {}
@@ -325,11 +344,13 @@ export default {
       this.openModal = true
       this.openModal = true
       console.log('----------修改')
       console.log('----------修改')
     },
     },
+    // 保存
     handleSubmit () {
     handleSubmit () {
       const _this = this
       const _this = this
       this.$refs.ruleForm.validate(valid => {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
         if (valid) {
           const params = JSON.parse(JSON.stringify(_this.form))
           const params = JSON.parse(JSON.stringify(_this.form))
+          console.log(params, 'params')
           if (params.limitFlag == '') {
           if (params.limitFlag == '') {
             params.limitFlag = 0
             params.limitFlag = 0
           }
           }
@@ -380,13 +401,16 @@ export default {
 </script>
 </script>
 
 
 <style lang="less">
 <style lang="less">
-  .goodsAllocationSet-page{
+  .settlementSet-page{
     position: relative;
     position: relative;
     height: 100%;
     height: 100%;
     padding-bottom: 51px;
     padding-bottom: 51px;
     box-sizing: border-box;
     box-sizing: border-box;
-    .goodsAllocationSet-baseInfo{
+    .settlementSet-baseInfo{
       margin-bottom: 10px;
       margin-bottom: 10px;
+      .ant-input-number-handler-wrap{
+        display: none;
+      }
     }
     }
     .bzj-collapse{
     .bzj-collapse{
       margin-top: 10px;
       margin-top: 10px;