zhangdan 3 anni fa
parent
commit
5d7d331197

+ 1 - 1
src/views/numsGoodsShelves/bondManagement/addbond.vue

@@ -49,7 +49,7 @@
                   style="width: 100%;display: inline-block;" />
               </a-form-model-item>
             </a-col>
-            <a-col :span="2"> <span style="display: inline-block; padding-top: 10px;">元</span></a-col>
+            <a-col :span="4"> <span style="display: inline-block; padding-top: 10px;">元</span></a-col>
           </a-row>
           <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' }" id="addbond-handleSubmit">保存</a-button>

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

@@ -63,7 +63,7 @@ export default {
         shelfPlaceCode: '' // 货位号
       },
       rules: {
-        shelfPlaceCode: [ { required: true, message: '请输入货位号', trigger: 'blur' }]
+        shelfPlaceCode: [ { required: true, message: '请输入货位号', trigger: 'blur' }]
       }
     }
   },

+ 2 - 2
src/views/numsGoodsShelves/partsDealerManagement/setSHModal.vue

@@ -16,8 +16,8 @@
           ref="ruleForm"
           :model="form"
           :rules="rules"
-          :labelCol="{span:5}"
-          :wrapperCol="{span:15}"
+          :labelCol="{span:6}"
+          :wrapperCol="{span:16}"
         >
           <a-form-model-item label="配件经销商" >
             <span>{{ form.dealerEntity?form.dealerEntity.dealerName:'--' }}</span>

+ 5 - 9
src/views/power/role/roleList.vue

@@ -28,7 +28,7 @@
         </a-form>
       </div>
       <div class="table-operator">
-        <a-button type="primary" class="button-error" @click="openModal" id="roleList-openModal">新增</a-button>
+        <a-button type="primary" class="button-error" @click="openModal" id="roleList-openModal">新增角色</a-button>
       </div>
       <s-table
         class="sTable fixPagination"
@@ -57,13 +57,9 @@
         </template>
         <!-- 操作 -->
         <span slot="action" slot-scope="text, record">
-          <a-icon type="setting" title="菜单权限" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="openMenuModal(record)" />
-          <a-icon type="edit" title="编辑" :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}" @click="handleEdit(record)" />
-          <a-icon
-            type="delete"
-            title="删除"
-            :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
-            @click="delect(record)" />
+          <a-button size="small" type="link" class="button-info" @click="openMenuModal(record)">菜单权限</a-button>
+          <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" v-if="record.isEnable">编辑</a-button>
+          <a-button size="small" type="link" class="button-info" @click="delect(record)" v-if="!record.isEnable">删除</a-button>
         </span>
       </s-table>
     </a-spin>
@@ -113,7 +109,7 @@ export default {
         { title: '角色名称', dataIndex: 'name', width: '25%', align: 'center' },
         { title: '角色描述', dataIndex: 'remarks', width: '25%', align: 'center', scopedSlots: { customRender: 'remarks' } },
         { title: '状态', width: '15%', align: 'center', scopedSlots: { customRender: 'status' } },
-        { title: '操作', width: '15%', align: 'center', scopedSlots: { customRender: 'action' } }
+        { title: '操作', width: '15%', align: 'left', scopedSlots: { customRender: 'action' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 4 - 19
src/views/power/user/userList.vue

@@ -27,7 +27,7 @@
         </a-form>
       </div>
       <div class="table-operator">
-        <a-button type="primary" class="button-error" @click="openModal">新增</a-button>
+        <a-button type="primary" class="button-error" @click="openModal">新增用户</a-button>
       </div>
       <s-table
         class="sTable fixPagination"
@@ -45,22 +45,9 @@
           <!-- <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span> -->
         </span>
         <span slot="action" slot-scope="text, record">
-          <a-icon
-            type="edit"
-            title="编辑"
-            :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}"
-            @click="handleEdit(record)"
-          />
-          <a-icon
-            type="unlock"
-            title="重置密码"
-            :style="{fontSize: '20px',color:' #ffaa00',padding: '0 10px'}"
-            @click="resetPassword(record)" />
-          <a-icon
-            type="delete"
-            title="删除"
-            :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
-            @click="delect(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="resetPassword(record)" v-if="record.loginFlag">重置密码</a-button>
+          <a-button size="small" type="link" class="button-info" @click="delect(record)" v-if="!record.loginFlag">删除</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>
       </s-table>
@@ -97,10 +84,8 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '来源', dataIndex: 'org.name', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '用户名称', dataIndex: 'name', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '手机号码', dataIndex: 'phone', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '用户账号', dataIndex: 'loginName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '角色', width: '15%', align: 'center', dataIndex: 'roleNames', customRender: function (text) { return text || '--' } },
         { title: '状态', width: '10%', align: 'center', scopedSlots: { customRender: 'status' } },
         { title: '操作', width: '15%', align: 'left', scopedSlots: { customRender: 'action' } }

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: ' http://192.168.16.107:7300/mock/61aeb88e4b9f94168035f9e0/xprh-admin',
+        // target: 'http://p.xprh.360arrow.com/xprh-admin',
         target: 'http://192.168.16.151:8701/xprh-admin',
         // ws: false,
         ws: true,