From f57c667d1a29220fc2a5a23ccad3a43905650c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 8 Dec 2021 22:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/mixins/JeecgListMixin.js       |   4 +-
 jshERP-web/src/views/bill/PurchaseInList.vue  |   2 +-
 .../src/views/system/SystemConfigList.vue     | 270 ++++++++++--------
 .../system/modules/SystemConfigModal.vue      | 183 ------------
 4 files changed, 147 insertions(+), 312 deletions(-)
 delete mode 100644 jshERP-web/src/views/system/modules/SystemConfigModal.vue

diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index 81398e47..55da6eef 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -15,6 +15,8 @@ export const JeecgListMixin = {
     return {
       //token header
       tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)},
+      /*卡片样式 */
+      cardStyle: 'height:' + (document.documentElement.clientHeight-125) + 'px',
       /* 查询条件-请不要在queryParam中声明非字符串值的属性 */
       queryParam: {},
       /* 数据源 */
@@ -57,7 +59,7 @@ export const JeecgListMixin = {
       /** 是否加载时就执行 */
       disableMixinCreated: false,
       /* 按钮权限 */
-      btnEnableList: '',
+      btnEnableList: ''
     }
   },
   created() {
diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue
index d2fd855f..944e3d31 100644
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -1,7 +1,7 @@
 <template>
   <a-row :gutter="24">
     <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
         <!-- 查询区域 -->
         <div class="table-page-search-wrapper">
           <!-- 搜索区域 -->
diff --git a/jshERP-web/src/views/system/SystemConfigList.vue b/jshERP-web/src/views/system/SystemConfigList.vue
index 5e861b3c..5af7c20e 100644
--- a/jshERP-web/src/views/system/SystemConfigList.vue
+++ b/jshERP-web/src/views/system/SystemConfigList.vue
@@ -1,150 +1,166 @@
 <template>
-  <a-row :gutter="24">
-    <a-col :md="24">
-      <a-card :bordered="false">
-        <!-- 查询区域 -->
-        <div class="table-page-search-wrapper">
-          <!-- 搜索区域 -->
-          <a-form layout="inline" @keyup.enter.native="searchQuery">
-            <a-row :gutter="24">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="公司名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入公司名称查询" v-model="queryParam.companyName"></a-input>
-                </a-form-item>
-              </a-col>
-              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                <a-col :md="6" :sm="24">
-                  <a-button type="primary" @click="searchQuery">查询</a-button>
-                  <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
-                </a-col>
-              </span>
-            </a-row>
+  <a-card :style="cardStyle" :bordered="false">
+    <a-row :gutter="24">
+      <a-col :md="12">
+        <a-spin :spinning="confirmLoading">
+          <a-form :form="form" id="systemConfigModal">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司名称">
+              <a-input placeholder="请输入公司名称" v-decorator.trim="[ 'companyName', validatorRules.companyName]" />
+            </a-form-item>
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
+              <a-input placeholder="请输入联系人" v-decorator.trim="[ 'companyContacts' ]" />
+            </a-form-item>
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司地址">
+              <a-input placeholder="请输入公司地址" v-decorator.trim="[ 'companyAddress' ]" />
+            </a-form-item>
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司电话">
+              <a-input placeholder="请输入公司电话" v-decorator.trim="[ 'companyTel' ]" />
+            </a-form-item>
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司传真">
+              <a-input placeholder="请输入公司传真" v-decorator.trim="[ 'companyFax' ]" />
+            </a-form-item>
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司邮编">
+              <a-input placeholder="请输入公司邮编" v-decorator.trim="[ 'companyPostCode' ]" />
+            </a-form-item>
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库权限">
+              <a-switch checked-children="启用" un-checked-children="关闭" v-model="depotFlagSwitch" @change="onDepotChange"></a-switch>
+              （如果启用则需要到<b>用户管理</b>进行<b>分配仓库</b>）
+            </a-form-item>
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户权限">
+              <a-switch checked-children="启用" un-checked-children="关闭" v-model="customerFlagSwitch" @change="onCustomerChange"></a-switch>
+              （如果启用则需要到<b>用户管理</b>进行<b>分配客户</b>）
+            </a-form-item>
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="负库存">
+              <a-switch checked-children="启用" un-checked-children="关闭" v-model="minusStockFlagSwitch" @change="onMinusStockChange"></a-switch>
+              （如果启用则单据支持负库存，批次商品除外）
+            </a-form-item>
           </a-form>
-        </div>
-        <!-- 操作按钮区域 -->
-        <div class="table-operator"  style="margin-top: 5px">
-          <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
-          <a-dropdown>
-            <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>
-            <a-button>
-              批量操作 <a-icon type="down" />
-            </a-button>
-          </a-dropdown>
-        </div>
-        <!-- table区域-begin -->
-        <div>
-          <a-table
-            ref="table"
-            size="middle"
-            bordered
-            rowKey="id"
-            :columns="columns"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :scroll="scroll"
-            :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-            @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>删除</a>
-              </a-popconfirm>
-            </span>
-            <!-- 状态渲染模板 -->
-            <template slot="customRenderFlag" slot-scope="flag">
-              <a-tag v-if="flag==1" color="green">启用</a-tag>
-              <a-tag v-if="flag==0" color="orange">关闭</a-tag>
-            </template>
-          </a-table>
-        </div>
-        <!-- table区域-end -->
-        <!-- 表单区域 -->
-        <systemConfig-modal ref="modalForm" @ok="modalFormOk"></systemConfig-modal>
-      </a-card>
-    </a-col>
-  </a-row>
+        </a-spin>
+      </a-col>
+    </a-row>
+    <a-row :gutter="24">
+      <a-col :md="12" align="middle">
+        <a-button type="primary" @click="handleOk">保存</a-button>
+        <a-button style="margin-left:20px" @click="handleReset">重置</a-button>
+      </a-col>
+    </a-row>
+  </a-card>
 </template>
 <!-- b y 7 5 2 7  1 8 9 2 0 -->
 <script>
-  import SystemConfigModal from './modules/SystemConfigModal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import JDate from '@/components/jeecg/JDate'
+  import pick from 'lodash.pick'
+  import {addSystemConfig,editSystemConfig,checkSystemConfig } from '@/api/api'
+  import {autoJumpNextInput} from "@/utils/util"
+  import {getAction } from '@/api/manage'
   export default {
     name: "SystemConfigList",
-    mixins:[JeecgListMixin],
-    components: {
-      SystemConfigModal,
-      JDate
-    },
     data () {
       return {
+        title:"操作",
+        cardStyle: 'height:' + (document.documentElement.clientHeight-125) + 'px',
+        visible: true,
+        model: {},
+        depotFlagSwitch: false, //仓库权限状态
+        customerFlagSwitch: false, //客户权限状态
+        minusStockFlagSwitch: false, //负库存状态
+        isReadOnly: false,
         labelCol: {
-          span: 5
+          xs: { span: 24 },
+          sm: { span: 5 },
         },
         wrapperCol: {
-          span: 18,
-          offset: 1
+          xs: { span: 24 },
+          sm: { span: 16 },
         },
-        // 查询条件
-        queryParam: {companyName:'',},
-        // 表头
-        columns: [
-          {
-            title: '#', dataIndex: '', key:'rowIndex', width:40, align:"center",
-            customRender:function (text,record,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {title: '公司名称', dataIndex: 'companyName', width: 150},
-          {title: '联系人', dataIndex: 'companyContacts', width: 80, align: "center"},
-          {title: '公司地址', dataIndex: 'companyAddress', width: 150, align: "center"},
-          {title: '公司电话', dataIndex: 'companyTel', width: 120, align: "center"},
-          {title: '公司传真', dataIndex: 'companyFax', width: 120, align: "center"},
-          {title: '公司邮编', dataIndex: 'companyPostCode', width: 80, align: "center"},
-          {
-            title: '仓库权限', dataIndex: 'depotFlag', width: 80, align: "center",
-            scopedSlots: { customRender: 'customRenderFlag' }
-          },
-          {
-            title: '客户权限', dataIndex: 'customerFlag', width: 80, align: "center",
-            scopedSlots: { customRender: 'customRenderFlag' }
-          },
-          {
-            title: '负库存', dataIndex: 'minusStockFlag', width: 80, align: "center",
-            scopedSlots: { customRender: 'customRenderFlag' }
-          },
-          {title: '操作', dataIndex: 'action', width: 150, align:"center",
-            scopedSlots: { customRender: 'action' },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          companyName:{
+            rules: [
+              { required: true, message: '请输入公司名称!' },
+              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }
+            ]
           }
-        ],
-        url: {
-          list: "/systemConfig/list",
-          delete: "/systemConfig/delete",
-          deleteBatch: "/systemConfig/deleteBatch"
-        },
+        }
       }
     },
-    computed: {
+    created () {
+      this.init()
     },
     methods: {
-      myHandleAdd() {
-        if(this.ipagination.total>=1) {
-          this.$message.warning('抱歉，只能填写一条系统配置信息！');
-        } else {
-          this.handleAdd()
-        }
+      onDepotChange(checked) {
+        this.model.depotFlag = checked?'1':'0'
       },
-      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
+      onCustomerChange(checked) {
+        this.model.customerFlag = checked?'1':'0'
+      },
+      onMinusStockChange(checked) {
+        this.model.minusStockFlag = checked?'1':'0'
+      },
+      init () {
+        let param = {
+          search: {"companyName":""},
+          currentPage: 1,
+          pageSize: 10
         }
+        getAction('/systemConfig/list', param).then((res)=>{
+          if(res.code === 200){
+            let record = res.data.rows[0]
+            this.form.resetFields();
+            this.model = Object.assign({}, record);
+            this.visible = true;
+            this.$nextTick(() => {
+              this.form.setFieldsValue(pick(this.model,'companyName', 'companyContacts', 'companyAddress',
+                'companyTel', 'companyFax', 'companyPostCode', 'depotFlag', 'customerFlag', 'minusStockFlag'))
+              autoJumpNextInput('systemConfigModal')
+            });
+            if(record.id) {
+              if (record.depotFlag != null) {
+                this.depotFlagSwitch = record.depotFlag == '1' ? true : false;
+              }
+              if (record.customerFlag != null) {
+                this.customerFlagSwitch = record.customerFlag == '1' ? true : false;
+              }
+              if (record.minusStockFlag != null) {
+                this.minusStockFlagSwitch = record.minusStockFlag == '1' ? true : false;
+              }
+            }
+          } else {
+            this.$message.info(res.data);
+          }
+        })
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            let obj;
+            if(!this.model.id){
+              obj=addSystemConfig(formData);
+            }else{
+              obj=editSystemConfig(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                this.init()
+                that.$message.info('保存成功！');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+        })
+      },
+      handleReset () {
+        this.form.resetFields();
+        this.depotFlagSwitch = false
+        this.customerFlagSwitch = false
+        this.minusStockFlagSwitch = false
       }
     }
   }
diff --git a/jshERP-web/src/views/system/modules/SystemConfigModal.vue b/jshERP-web/src/views/system/modules/SystemConfigModal.vue
deleted file mode 100644
index ee0cba7f..00000000
--- a/jshERP-web/src/views/system/modules/SystemConfigModal.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭"
-    wrapClassName="ant-modal-cust-warp"
-    style="top:10%;height: 85%;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" id="systemConfigModal">
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司名称">
-          <a-input placeholder="请输入公司名称" v-decorator.trim="[ 'companyName', validatorRules.companyName]" />
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="联系人">
-          <a-input placeholder="请输入联系人" v-decorator.trim="[ 'companyContacts' ]" />
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司地址">
-          <a-input placeholder="请输入公司地址" v-decorator.trim="[ 'companyAddress' ]" />
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司电话">
-          <a-input placeholder="请输入公司电话" v-decorator.trim="[ 'companyTel' ]" />
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司传真">
-          <a-input placeholder="请输入公司传真" v-decorator.trim="[ 'companyFax' ]" />
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司邮编">
-          <a-input placeholder="请输入公司邮编" v-decorator.trim="[ 'companyPostCode' ]" />
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库权限">
-          <a-switch checked-children="启用" un-checked-children="关闭" v-model="depotFlagSwitch" @change="onDepotChange"></a-switch>
-          （如果启用则需要到<b>用户管理</b>进行<b>分配仓库</b>）
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户权限">
-          <a-switch checked-children="启用" un-checked-children="关闭" v-model="customerFlagSwitch" @change="onCustomerChange"></a-switch>
-          （如果启用则需要到<b>用户管理</b>进行<b>分配客户</b>）
-        </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="负库存">
-          <a-switch checked-children="启用" un-checked-children="关闭" v-model="minusStockFlagSwitch" @change="onMinusStockChange"></a-switch>
-          （如果启用则单据支持负库存，批次商品除外）
-        </a-form-item>
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-<script>
-  import pick from 'lodash.pick'
-  import {addSystemConfig,editSystemConfig,checkSystemConfig } from '@/api/api'
-  import {autoJumpNextInput} from "@/utils/util"
-  export default {
-    name: "SystemConfigModal",
-    data () {
-      return {
-        title:"操作",
-        visible: false,
-        model: {},
-        depotFlagSwitch: false, //仓库权限状态
-        customerFlagSwitch: false, //客户权限状态
-        minusStockFlagSwitch: false, //负库存状态
-        isReadOnly: false,
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules:{
-          companyName:{
-            rules: [
-              { required: true, message: '请输入公司名称!' },
-              { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' },
-              { validator: this.validateSystemConfig}
-            ]
-          }
-        }
-      }
-    },
-    created () {
-    },
-    methods: {
-      onDepotChange(checked) {
-        this.model.depotFlag = checked?'1':'0'
-      },
-      onCustomerChange(checked) {
-        this.model.customerFlag = checked?'1':'0'
-      },
-      onMinusStockChange(checked) {
-        this.model.minusStockFlag = checked?'1':'0'
-      },
-      add () {
-        this.depotFlagSwitch = false
-        this.customerFlagSwitch = false
-        this.minusStockFlagSwitch = false
-        this.edit({});
-      },
-      edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'companyName', 'companyContacts', 'companyAddress',
-            'companyTel', 'companyFax', 'companyPostCode', 'depotFlag', 'customerFlag', 'minusStockFlag'))
-          autoJumpNextInput('systemConfigModal')
-        });
-        if(record.id) {
-          if (record.depotFlag != null) {
-            this.depotFlagSwitch = record.depotFlag == '1' ? true : false;
-          }
-          if (record.customerFlag != null) {
-            this.customerFlagSwitch = record.customerFlag == '1' ? true : false;
-          }
-          if (record.minusStockFlag != null) {
-            this.minusStockFlagSwitch = record.minusStockFlag == '1' ? true : false;
-          }
-        }
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let formData = Object.assign(this.model, values);
-            let obj;
-            if(!this.model.id){
-              obj=addSystemConfig(formData);
-            }else{
-              obj=editSystemConfig(formData);
-            }
-            obj.then((res)=>{
-              if(res.code === 200){
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.data.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-      validateSystemConfig(rule, value, callback){
-        let params = {
-          name: value,
-          id: this.model.id?this.model.id:0
-        };
-        checkSystemConfig(params).then((res)=>{
-          if(res && res.code===200) {
-            if(!res.data.status){
-              callback();
-            } else {
-              callback("公司名称已经存在");
-            }
-          } else {
-            callback(res.data);
-          }
-        });
-      }
-    }
-  }
-</script>
-<style scoped>
-
-</style>
\ No newline at end of file