From 2b994b54b942fa3f759ce7195671d85f9718c70e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Mon, 20 Feb 2023 10:29:57 +0800
Subject: [PATCH] 2/20

---
 src/views/main/PrinttemplateRight/addForm.vue |  10 +-
 .../main/PrinttemplateRightOld/addForm.vue    | 133 -------------
 .../main/PrinttemplateRightOld/editForm.vue   | 141 --------------
 .../main/PrinttemplateRightOld/index.vue      | 179 ------------------
 4 files changed, 9 insertions(+), 454 deletions(-)
 delete mode 100644 src/views/main/PrinttemplateRightOld/addForm.vue
 delete mode 100644 src/views/main/PrinttemplateRightOld/editForm.vue
 delete mode 100644 src/views/main/PrinttemplateRightOld/index.vue

diff --git a/src/views/main/PrinttemplateRight/addForm.vue b/src/views/main/PrinttemplateRight/addForm.vue
index 5636dea..865a484 100644
--- a/src/views/main/PrinttemplateRight/addForm.vue
+++ b/src/views/main/PrinttemplateRight/addForm.vue
@@ -14,8 +14,15 @@
             <a-form-item label="用户" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-select
                 placeholder="请选择用户"
-                v-decorator="['sysUserId', { rules: [{ required: true, message: '请选择用户！' }] }]"
+                mode="multiple"
+                show-search
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+                v-decorator="['userIdList', { rules: [{ required: true, message: '请选择用户！' }] }]"
               >
+                <!-- v-decorator="['sysUserId', { rules: [{ required: true, message: '请选择用户！' }] }]" -->
                 <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -132,6 +139,7 @@ export default {
           //     values[key] = JSON.stringify(values[key])
           //   }
           // }
+          console.log(values)
           BookingTemplateAddPrinttemplateRight(values)
             .then(res => {
               if (res.success) {
diff --git a/src/views/main/PrinttemplateRightOld/addForm.vue b/src/views/main/PrinttemplateRightOld/addForm.vue
deleted file mode 100644
index 4964311..0000000
--- a/src/views/main/PrinttemplateRightOld/addForm.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-  <a-modal
-    title="新增配置"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-        <a-row>
-          <a-col :span="24">
-            <a-form-item label="用户" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-select
-                placeholder="请选择用户"
-                v-decorator="['sysUserId', { rules: [{ required: true, message: '请选择用户！' }] }]"
-              >
-                <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
-                  {{ item.name }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="打印模板" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-select
-                placeholder="请选择打印模板"
-                mode="multiple"
-                v-decorator="['printTemplateId', { rules: [{ required: true, message: '请选择用户！' }] }]"
-              >
-                <a-select-option v-for="item in TemplateList" :key="item.id" :value="item.id">
-                  {{ item.typeName }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-import {
-  BookingTemplateAddPrinttemplateRight,
-  SysUserPage,
-  BookingPrintTemplateGetPrintTemplateList
-} from '@/api/modular/main/PrinttemplateRight'
-export default {
-  data() {
-    return {
-      TypeData: [],
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 6 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 }
-      },
-      labelCol2: {
-        xs: { span: 24 },
-        sm: { span: 3 }
-      },
-      wrapperCol2: {
-        xs: { span: 24 },
-        sm: { span: 20 }
-      },
-      visible: false,
-      confirmLoading: false,
-      form: this.$form.createForm(this),
-      UserList: [],
-      TemplateList: []
-    }
-  },
-  mounted() {
-    SysUserPage().then(res => {
-      this.UserList = res.data.rows
-    })
-    BookingPrintTemplateGetPrintTemplateList().then(res => {
-      this.TemplateList = res.data.rows
-    })
-  },
-  methods: {
-    // 初始化方法
-    add(record) {
-      this.visible = true
-    },
-    /**
-     * 提交表单
-     */
-    FnChangeCtnCategory(e) {
-      console.log(e)
-    },
-    handleSubmit() {
-      const {
-        form: { validateFields }
-      } = this
-      this.confirmLoading = true
-      validateFields((errors, values) => {
-        if (!errors) {
-          // for (const key in values) {
-          //   if (typeof values[key] === 'object' && !(values[key] === null)) {
-          //     values[key] = JSON.stringify(values[key])
-          //   }
-          // }
-          BookingTemplateAddPrinttemplateRight(values)
-            .then(res => {
-              if (res.success) {
-                this.$message.success('新增成功')
-                this.confirmLoading = false
-                this.$emit('ok', values)
-                this.handleCancel()
-              } else {
-                this.$message.error(`新增失败,${res.message}`)
-              }
-            })
-            .finally(res => {
-              this.confirmLoading = false
-            })
-        } else {
-          this.confirmLoading = false
-        }
-      })
-    },
-    handleCancel() {
-      this.form.resetFields()
-      this.visible = false
-    }
-  }
-}
-</script>
diff --git a/src/views/main/PrinttemplateRightOld/editForm.vue b/src/views/main/PrinttemplateRightOld/editForm.vue
deleted file mode 100644
index b813212..0000000
--- a/src/views/main/PrinttemplateRightOld/editForm.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
-  <a-modal
-    title="编辑配置"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-  >
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-        <a-row>
-          <a-col :span="24">
-            <a-form-item label="用户" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-select
-                placeholder="请选择用户"
-                v-decorator="['sysUserId', { rules: [{ required: true, message: '请选择用户！' }] }]"
-              >
-                <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
-                  {{ item.name }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="打印模板" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-select
-                placeholder="请选择打印模板"
-                mode="multiple"
-                v-decorator="['printTemplateId', { rules: [{ required: true, message: '请选择用户！' }] }]"
-              >
-                <a-select-option v-for="item in TemplateList" :key="item.id" :value="item.id">
-                  {{ item.typeName }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-import {
-  BookingTemplateAddPrinttemplateRight,
-  SysUserPage,
-  BookingPrintTemplateGetPrintTemplateList
-} from '@/api/modular/main/PrinttemplateRight'
-export default {
-  data() {
-    return {
-      TypeData: [],
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 6 }
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 }
-      },
-      labelCol2: {
-        xs: { span: 24 },
-        sm: { span: 3 }
-      },
-      wrapperCol2: {
-        xs: { span: 24 },
-        sm: { span: 20 }
-      },
-      visible: false,
-      confirmLoading: false,
-      form: this.$form.createForm(this),
-      TemplateList: [],
-      UserList: []
-    }
-  },
-  mounted() {
-    SysUserPage().then(res => {
-      this.UserList = res.data.rows
-    })
-    BookingPrintTemplateGetPrintTemplateList().then(res => {
-      this.TemplateList = res.data.rows
-    })
-  },
-  methods: {
-    // 初始化方法
-    edit(record) {
-      this.data = record
-      console.log(record)
-      this.visible = true
-      setTimeout(() => {
-        this.form.setFieldsValue({
-          sysUserId: record.sysUserId.toString(),
-          printTemplateId: record.printTemplateId
-        })
-        console.log(this.form.getFieldsValue())
-      }, 100)
-    },
-    handleSubmit() {
-      const {
-        form: { validateFields }
-      } = this
-      this.confirmLoading = true
-      validateFields((errors, values) => {
-        console.log(errors, values)
-        if (!errors) {
-          for (const key in values) {
-            console.log(key, 1)
-            if (typeof values[key] === 'object' && !(values[key] === null)) {
-              values[key] = JSON.stringify(values[key])
-            }
-          }
-          console.log(this.form, values.gid)
-          values.gid = this.data.gid
-          console.log(values)
-          BookingTemplateAddPrinttemplateRight(values)
-            .then(res => {
-              if (res.success) {
-                this.$message.success('编辑成功')
-                this.confirmLoading = false
-                this.$emit('ok', values)
-                this.handleCancel()
-              } else {
-                this.$message.error(`编辑失败,${res.message}`)
-              }
-            })
-            .finally(res => {
-              this.confirmLoading = false
-            })
-        } else {
-          this.confirmLoading = false
-        }
-      })
-    },
-    handleCancel() {
-      this.form.resetFields()
-      this.visible = false
-    }
-  }
-}
-</script>
diff --git a/src/views/main/PrinttemplateRightOld/index.vue b/src/views/main/PrinttemplateRightOld/index.vue
deleted file mode 100644
index d888589..0000000
--- a/src/views/main/PrinttemplateRightOld/index.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-  <div>
-    <a-card :bordered="false" :bodyStyle="tstyle">
-      <div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
-        <a-form layout="inline">
-          <a-row :gutter="48">
-            <a-col :md="18">
-              <a-row :gutter="48">
-                <a-col :md="8" :sm="24">
-                  <a-form-item label="用户：">
-                    <a-select placeholder="请选择用户" v-model="queryParam.userId">
-                      <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
-                        {{ item.name }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                </a-col>
-              </a-row>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="FnGetData">查询</a-button>
-                <a-button style="margin-left: 8px" @click="init">重置</a-button>
-                <!-- <a @click="toggleAdvanced" style="margin-left: 8px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'" />
-                </a> -->
-              </span>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-    </a-card>
-    <a-card :bordered="false">
-      <vxe-toolbar>
-        <template #buttons>
-          <a-button type="primary" icon="plus" @click="$refs.addForm.add()">
-            新增配置
-          </a-button>
-        </template>
-      </vxe-toolbar>
-      <vxe-table :data="loadData" border :loading="loading" height="600px" empty-text="没有更多数据了！">
-        <vxe-column type="seq" width="50" fixed="left"></vxe-column>
-        <vxe-column
-          v-for="item in columns"
-          :key="`${item.dataIndex}3`"
-          :field="item.dataIndex"
-          :min-width="item.width"
-          :title="item.title"
-          :align="item.align"
-          :show-overflow="true"
-        >
-        </vxe-column>
-        <vxe-column title="操作" fixed="right" width="200" align="center">
-          <template #default="{ row }">
-            <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
-            <a-popconfirm title="是否确认删除?" ok-text="是" cancel-text="否" @confirm="confirm(row)">
-              <vxe-button type="text">删除</vxe-button>
-            </a-popconfirm>
-          </template>
-        </vxe-column>
-      </vxe-table>
-      <add-form ref="addForm" @ok="handleOk" />
-      <edit-form ref="editForm" @ok="handleOk" />
-    </a-card>
-  </div>
-</template>
-<script>
-import {
-  BookingTemplateGetPrinttemplateRightList,
-  BookingPrintTemplateDeletePrinttemplateRight,
-  SysUserGetTenantUser
-} from '@/api/modular/main/PrinttemplateRight'
-import addForm from './addForm.vue'
-import editForm from './editForm.vue'
-export default {
-  components: {
-    addForm,
-    editForm
-  },
-  data() {
-    return {
-      TypeData: [],
-      // 高级搜索 展开/关闭
-      advanced: false,
-      loading: false,
-      setVisible: false,
-      setVisible1: false,
-      queryParam: {
-        // currentPage: 1,
-        // pageSize: 10,
-        // totalResult: 1
-      },
-      ColumnsQuery: [],
-      columns: [
-        {
-          title: '文件名称',
-          align: 'center',
-          dataIndex: 'fileName'
-        },
-        {
-          title: '类型名称',
-          align: 'center',
-          dataIndex: 'typeName'
-        },
-        {
-          title: '用户名称',
-          align: 'center',
-          dataIndex: 'userName'
-        }
-      ],
-      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
-      // 加载数据方法 必须为 Promise 对象
-      loadData: [],
-      CodeData: [],
-      WCodeData: [],
-      ModulesData: [],
-      carrierCodeData: [],
-      UserList: []
-    }
-  },
-  created() {},
-  mounted() {
-    this.init()
-  },
-  methods: {
-    confirm(e) {
-      this.FnDel(e)
-    },
-    FnDel(data) {
-      BookingPrintTemplateDeletePrinttemplateRight({ Ids: data.id }).then(res => {
-        this.$message.success('删除成功')
-        this.FnGetData()
-      })
-    },
-    toggleAdvanced() {
-      this.advanced = !this.advanced
-    },
-    init() {
-      Object.assign(this.$data, this.$options.data())
-      this.ColumnsQuery = this.columns
-      this.FnGetData()
-      SysUserGetTenantUser().then(res => {
-        this.UserList = res.data
-      })
-    },
-    FnGetData() {
-      this.loading = true
-      BookingTemplateGetPrinttemplateRightList(this.queryParam).then(res => {
-        if (res.code == 200) {
-          this.loadData = res.data
-        } else {
-          this.loadData = []
-          this.$message.warning(res.message)
-        }
-        this.loading = false
-      })
-    },
-    handleOk() {
-      this.FnGetData()
-    }
-  }
-}
-</script>
-<style lang="less">
-.table-operator {
-  margin-bottom: 18px;
-}
-
-button {
-  margin-right: 8px;
-}
-.Open {
-}
-.Close {
-  height: 45px;
-  overflow: hidden;
-}
-</style>