From 21633c673fe29314dc26edd02959ea809a015750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 31 May 2021 23:39:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=9A?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E9=80=89=E6=8B=A9=E3=80=81=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecgbiz/modal/JSelectMaterialModal.vue   | 22 +++++++++++++++++--
 .../modal/JSelectSerialMaterialModal.vue      | 18 +++++++++++++++
 .../src/views/bill/dialog/LinkBillList.vue    | 20 ++++++++++++++++-
 .../src/views/material/MaterialList.vue       |  8 +++++++
 .../views/material/modules/MaterialModal.vue  |  6 +++++
 jshERP-web/src/views/system/FunctionList.vue  | 17 +++++---------
 jshERP-web/src/views/system/RoleList.vue      |  8 +++----
 jshERP-web/src/views/system/UserList.vue      |  4 ++--
 8 files changed, 82 insertions(+), 21 deletions(-)

diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
index eea9d4c6..84d6309a 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue
@@ -55,6 +55,7 @@
             :pagination="ipagination"
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type: getType}"
             :loading="loading"
+            :customRow="rowAction"
             @change="handleTableChange">
           </a-table>
         </div>
@@ -108,8 +109,8 @@
         title: '选择商品',
         ipagination: {
           current: 1,
-          pageSize: 5,
-          pageSizeOptions: ['5', '10', '20', '30'],
+          pageSize: 10,
+          pageSizeOptions: ['10', '20', '30'],
           showTotal: (total, range) => {
             return range[0] + '-' + range[1] + ' 共' + total + '条'
           },
@@ -275,6 +276,23 @@
       },
       modalFormOk() {
         this.loadData();
+      },
+      rowAction(record, index) {
+        return {
+          on: {
+            click: () => {
+              let arr = []
+              arr.push(record.id)
+              this.selectedRowKeys = arr
+            },
+            dblclick: () => {
+              let arr = []
+              arr.push(record.id)
+              this.selectedRowKeys = arr
+              this.handleSubmit()
+            }
+          }
+        }
       }
     }
   }
diff --git a/jshERP-web/src/components/jeecgbiz/modal/JSelectSerialMaterialModal.vue b/jshERP-web/src/components/jeecgbiz/modal/JSelectSerialMaterialModal.vue
index d04c306e..5b22c409 100644
--- a/jshERP-web/src/components/jeecgbiz/modal/JSelectSerialMaterialModal.vue
+++ b/jshERP-web/src/components/jeecgbiz/modal/JSelectSerialMaterialModal.vue
@@ -39,6 +39,7 @@
             :pagination="ipagination"
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type: getType}"
             :loading="loading"
+            :customRow="rowAction"
             @change="handleTableChange">
           </a-table>
         </div>
@@ -223,6 +224,23 @@
       },
       modalFormOk() {
         this.loadData();
+      },
+      rowAction(record, index) {
+        return {
+          on: {
+            click: () => {
+              let arr = []
+              arr.push(record.id)
+              this.selectedRowKeys = arr
+            },
+            dblclick: () => {
+              let arr = []
+              arr.push(record.id)
+              this.selectedRowKeys = arr
+              this.handleSubmit()
+            }
+          }
+        }
       }
     }
   }
diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
index 015d4075..863a62a6 100644
--- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
@@ -18,7 +18,8 @@
       :dataSource="dataSource"
       :pagination="ipagination"
       :loading="loading"
-      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: getType}">
+      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: getType}"
+      :customRow="rowAction">
     </a-table>
     <!-- table区域-end -->
   </a-modal>
@@ -117,6 +118,23 @@
           }
         }
         this.selectBillIds = billIds.substring(1);
+      },
+      rowAction(record, index) {
+        return {
+          on: {
+            click: () => {
+              let arr = []
+              arr.push(record.id)
+              this.selectedRowKeys = arr
+            },
+            dblclick: () => {
+              let arr = []
+              arr.push(record.id)
+              this.selectedRowKeys = arr
+              this.handleOk()
+            }
+          }
+        }
       }
     }
   }
diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index 048d2c83..ca3219c1 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -225,6 +225,14 @@
             }
           }
         })
+      },
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
       }
     }
   }
diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index 26a2e28c..ac15d72c 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:5%;height: 100%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-tabs default-active-key="1">
@@ -163,6 +168,7 @@
         manyUnitStatus: true,
         unitChecked: false,
         model: {},
+        isReadOnly: false,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 8 },
diff --git a/jshERP-web/src/views/system/FunctionList.vue b/jshERP-web/src/views/system/FunctionList.vue
index 23c5ef6f..e0441f94 100644
--- a/jshERP-web/src/views/system/FunctionList.vue
+++ b/jshERP-web/src/views/system/FunctionList.vue
@@ -21,10 +21,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
-          <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -46,8 +46,8 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -119,14 +119,7 @@
 
     },
     methods: {
-      handleEdit: function (record) {
-        this.$refs.modalForm.edit(record);
-        this.$refs.modalForm.title = "编辑";
-        this.$refs.modalForm.disableSubmit = false;
-        if(this.btnEnableList.indexOf(1)===-1) {
-          this.$refs.modalForm.isReadOnly = true
-        }
-      }
+
     }
   }
 </script>
diff --git a/jshERP-web/src/views/system/RoleList.vue b/jshERP-web/src/views/system/RoleList.vue
index dda16616..64cf167a 100644
--- a/jshERP-web/src/views/system/RoleList.vue
+++ b/jshERP-web/src/views/system/RoleList.vue
@@ -45,10 +45,10 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a v-if="btnEnableList.indexOf(1)>-1" @click="handleSetFunction(record)">分配功能</a>
-          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a v-if="btnEnableList.indexOf(1)>-1" @click="handleSetPushBtn(record.id)">分配按钮</a>
-          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
+          <a @click="handleSetFunction(record)">分配功能</a>
+          <a-divider type="vertical" />
+          <a @click="handleSetPushBtn(record.id)">分配按钮</a>
+          <a-divider type="vertical" />
           <a @click="handleEdit(record)">编辑</a>
           <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
           <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
diff --git a/jshERP-web/src/views/system/UserList.vue b/jshERP-web/src/views/system/UserList.vue
index 8833dc90..689218ec 100644
--- a/jshERP-web/src/views/system/UserList.vue
+++ b/jshERP-web/src/views/system/UserList.vue
@@ -59,8 +59,8 @@
           <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
-          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical"/>
-          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定重置密码为123456吗?" @confirm="() => handleReset(record.id)">
+          <a-divider type="vertical"/>
+          <a-popconfirm title="确定重置密码为123456吗?" @confirm="() => handleReset(record.id)">
             <a>重置密码</a>
           </a-popconfirm>
         </span>