Merge remote-tracking branch 'origin/master'

sample-form-manager-ui/admin/.env.development

 #开发环境
 NODE_ENV = "development"
-VUE_APP_API_BASE_URL=http://192.168.0.98:17008
+VUE_APP_API_BASE_URL=http://192.168.0.98:11078
 #VUE_APP_API_BASE_URL=http://192.168.0.98:11071/zwfw
 #VUE_APP_API_BASE_URL=http://192.168.0.98:11023
 #VUE_APP_API_BASE_URL=http://192.168.0.217:17311
\ No newline at end of file

sample-form-manager-ui/admin/.env.production

 #生产环境
 NODE_ENV = "production"
-<<<<<<< HEAD
 VUE_APP_API_BASE_URL=http://192.168.0.98:17008
-=======
-VUE_APP_API_BASE_URL=http://192.168.0.251:11099
->>>>>>> 261f9fabe9cdcb5ca4e16170db6b02e66a2d29c8

sample-form-manager-ui/admin/src/assets/css/common.css

@@ -346,4 +346,22 @@
 .el-table__body-wrapper::-webkit-scrollbar-track {
     border-radius: 6px;
     background: #fff;
+}
+
+.autoWidth {
+    min-width: 120px;
+}
+.autoWidth .el-input__prefix {
+  position: relative;
+  left: 0px;
+  box-sizing: border-box;
+  border: 1px solid #ffffff00;
+  padding: 0px 30px;
+  height: 32px;
+  line-height: 32px;
+  visibility: hidden;
+}
+.autoWidth .el-input__inner {
+  padding-left: 15px !important;
+  position: absolute;
 }
\ No newline at end of file

sample-form-manager-ui/admin/src/pages/software/librarymanage/LibraryManage.vue

@@ -14,18 +14,27 @@
           >
         </div>
         <div slot="right" class="flex">
-          <el-select v-model="department" size="small" placeholder="选择部门">
+          <el-select
+            v-model="department"
+            size="small"
+            class="autoWidth"
+            placeholder="选择部门"
+          >
+            <template slot="prefix">
+              {{ (deptList.find((v) => v.id === department) || {}).name }}
+            </template>
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
             >
             </el-option>
           </el-select>
           <el-input
             size="small"
             v-model="searchVal"
+            style="width: 200px"
             class="ml10 mr10"
             placeholder="请输入事项名称搜索"
           ></el-input>
@@ -126,6 +135,7 @@
 import TableHeader from "@/components/TableHeader.vue";
 import AddMaterals from "./modal/AddMaterals.vue";
 import PreviewMaterals from "./modal/PreviewMaterals.vue";
+import { mapGetters } from "vuex";
 export default {
   components: {
     TableHeader,
@@ -135,28 +145,6 @@ export default {
   data() {
     return {
       department: "",
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕",
-        },
-        {
-          value: "选项2",
-          label: "双皮奶",
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎",
-        },
-        {
-          value: "选项4",
-          label: "龙须面",
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭",
-        },
-      ],
       searchVal: "",
       tableData: [
         {
@@ -189,6 +177,9 @@ export default {
       previewVisible: false,
     };
   },
+  computed: {
+    ...mapGetters(["deptList"]),
+  },
   methods: {
     // 加入材料
     handleAddMaterials() {

sample-form-manager-ui/admin/src/pages/software/librarymanage/modal/AddMaterals.vue

@@ -3,18 +3,27 @@
     <el-dialog title="请选择材料加入公共库" :visible.sync="Visible" width="50%">
       <TableHeader>
         <div slot="right" class="flex">
-          <el-select v-model="department" size="small" placeholder="选择部门">
+          <el-select
+            v-model="department"
+            class="autoWidth"
+            size="small"
+            placeholder="选择部门"
+          >
+            <template slot="prefix">
+              {{ (deptList.find((v) => v.id === department) || {}).name }}
+            </template>
             <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-for="item in deptList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
             >
             </el-option>
           </el-select>
           <el-input
             size="small"
             v-model="searchVal"
+            style="width: 200px"
             class="ml10 mr10"
             placeholder="请输入事项名称搜索"
           ></el-input>
@@ -93,6 +102,7 @@
 
 <script>
 import TableHeader from "@/components/TableHeader.vue";
+import { mapGetters } from "vuex";
 export default {
   components: {
     TableHeader,
@@ -113,28 +123,6 @@ export default {
   },
   data() {
     return {
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕",
-        },
-        {
-          value: "选项2",
-          label: "双皮奶",
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎",
-        },
-        {
-          value: "选项4",
-          label: "龙须面",
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭",
-        },
-      ],
       department: "",
       searchVal: "",
       tableData: [
@@ -172,6 +160,7 @@ export default {
         this.$emit("update:libVisible", val);
       },
     },
+    ...mapGetters(["deptList"]),
   },
   methods: {
     handleOk() {

sample-form-manager-ui/admin/src/pages/software/materials/MaterialsManage.vue

@@ -16,7 +16,11 @@
               v-model="departmentLeft"
               size="small"
               placeholder="选择部门"
+              class="autoWidth"
             >
+              <template slot="prefix">
+                {{ (deptList.find((v) => v.id === departmentLeft) || {}).name }}
+              </template>
               <el-option
                 v-for="item in deptList"
                 :key="item.id"
@@ -28,6 +32,7 @@
             <el-input
               size="small"
               v-model="leftSearch"
+              style="width: 200px"
               class="ml10 mr10"
               placeholder="请输入事项名称搜索"
             ></el-input>
@@ -65,7 +70,6 @@
                 label="部门"
                 align="center"
                 prop="deptName"
-                width="80"
               >
               </el-table-column>
               <el-table-column
@@ -81,7 +85,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                prop="count"
+                prop="datumCount"
                 label="材料数量"
                 align="center"
                 width="80"
@@ -129,7 +133,13 @@
               v-model="departmentRight"
               size="small"
               placeholder="选择部门"
+              class="autoWidth"
             >
+              <template slot="prefix">
+                {{
+                  (deptList.find((v) => v.id === departmentRight) || {}).name
+                }}
+              </template>
               <el-option
                 v-for="item in deptList"
                 :key="item.id"
@@ -140,6 +150,7 @@
             </el-select>
             <el-input
               size="small"
+              style="width: 200px"
               v-model="rightSearch"
               class="ml10 mr10"
               placeholder="请输入材料名称搜索"
@@ -179,7 +190,6 @@
               label="部门"
               align="center"
               prop="deptName"
-              width="80"
             >
             </el-table-column>
             <el-table-column prop="name" show-overflow-tooltip label="材料名称">

sample-form-manager-ui/admin/src/pages/software/materials/modal/AddMaterials.vue

@@ -8,10 +8,18 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="材料简称" prop="materialName">
-          <el-input size="small" v-model="form.materialName"></el-input>
+          <el-input
+            size="small"
+            v-model="form.materialName"
+            placeholder="请输入材料简称"
+          ></el-input>
         </el-form-item>
         <el-form-item label="材料全称" prop="materiaFullName">
-          <el-input size="small" v-model="form.materiaFullName"></el-input>
+          <el-input
+            size="small"
+            v-model="form.materiaFullName"
+            placeholder="请输入材料全称"
+          ></el-input>
         </el-form-item>
         <el-form-item label="所属事项">
           <el-input disabled size="small" v-model="form.matterName"></el-input>
@@ -43,7 +51,7 @@
             :before-upload="beforeUpload"
             accept="application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document"
           >
-            <el-button size="small" type="primary">点击上传</el-button>
+            <el-button size="small" type="primary">上传Word文件</el-button>
           </el-upload>
         </el-form-item>
        <el-form-item label="上传模板" prop="templatePath">
@@ -58,7 +66,7 @@
             :before-upload="beforeUpload"
             accept="application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document"
           >
-            <el-button size="small" type="primary">点击上传</el-button>
+            <el-button size="small" type="primary">上传Word文件</el-button>
           </el-upload>
         </el-form-item>-->
         <el-form-item label="上传样表" prop="samplePath">
@@ -73,7 +81,7 @@
             :before-upload="beforeUpload"
             accept="application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document"
           >
-            <el-button size="small" type="primary">点击上传</el-button>
+            <el-button size="small" type="primary">上传Word文件</el-button>
           </el-upload>
         </el-form-item>
       </el-form>

sample-form-manager-ui/admin/src/pages/software/matter/MatterManage.vue

@@ -20,7 +20,11 @@
               v-model="departmentLeft"
               size="small"
               placeholder="选择部门"
+              class="autoWidth"
             >
+              <template slot="prefix">
+                {{ (deptList.find((v) => v.id === departmentLeft) || {}).name }}
+              </template>
               <el-option
                 v-for="item in deptList"
                 :key="item.id"
@@ -31,6 +35,7 @@
             </el-select>
             <el-input
               size="small"
+              style="width: 200px"
               v-model="leftSearch"
               class="ml10 mr10"
               placeholder="请输入事项名称搜索"
@@ -53,6 +58,7 @@
             max-height="550px"
             :row-key="(row) => row.id"
             @selection-change="handleSelectionChange"
+            ref="rightTable"
           >
             <el-table-column type="selection" width="55" align="center">
             </el-table-column>
@@ -69,7 +75,6 @@
               label="部门"
               align="center"
               prop="deptName"
-              width="80"
             >
             </el-table-column>
             <el-table-column prop="name" show-overflow-tooltip label="事项名称">
@@ -160,7 +165,13 @@
               v-model="departmentRight"
               size="small"
               placeholder="选择部门"
+              class="autoWidth"
             >
+              <template slot="prefix">
+                {{
+                  (deptList.find((v) => v.id === departmentRight) || {}).name
+                }}
+              </template>
               <el-option
                 v-for="item in deptList"
                 :key="item.id"
@@ -194,7 +205,12 @@
             :row-key="(row) => row.id"
             @selection-change="handleSelectionChangeRight"
           >
-            <el-table-column type="selection" width="55" align="center">
+            <el-table-column
+              type="selection"
+              reserve-selection
+              width="55"
+              align="center"
+            >
             </el-table-column>
             <el-table-column
               type="index"
@@ -209,7 +225,6 @@
               label="部门"
               align="center"
               prop="department"
-              width="80"
             >
             </el-table-column>
             <el-table-column
@@ -447,6 +462,7 @@ export default {
       if (code === 1) {
         this.$message.success(msg);
         this.rightSelectedRowKeys = [];
+        this.$refs.rightTable.clearSelection();
         this.getWriteMatterList();
       }
     },

sample-form-manager-ui/admin/src/utils/request.js

 /**
  *  axios 工具函数层
  */
-import axios from 'axios'
-import { Message } from 'element-ui';
-import local from "@/utils/local"
+import axios from "axios";
+import { Message } from "element-ui";
+import local from "@/utils/local";
 // import router from "@/router"
 // 请求超时时间
-axios.defaults.timeout = 10 * 1000
+axios.defaults.timeout = 10 * 1000;
 
 // 设置统一服务器地址
-axios.defaults.baseURL = process.env.VUE_APP_API_BASE_URL
+axios.defaults.baseURL = process.env.VUE_APP_API_BASE_URL;
 // 请求拦截
-axios.interceptors.request.use(config => {
-    let token = local.getLocal('sampleToken')
+axios.interceptors.request.use(
+  (config) => {
+    let token = local.getLocal("sampleToken");
     if (token) {
-        config.headers.Authorization = token
-        config.headers.Authtoken = token
+      config.headers.Authorization = token;
+      config.headers.Authtoken = token;
     }
-    return config
-}, err => {
-    return Promise.reject(err)
-})
+    return config;
+  },
+  (err) => {
+    return Promise.reject(err);
+  }
+);
 
 // 响应拦截
-axios.interceptors.response.use(response => {
+axios.interceptors.response.use(
+  (response) => {
     if (response.data.code !== undefined && response.data.msg !== undefined) {
-        // 取出数据
-        let { code, msg } = response.data
-        if(code === -1){
-            Message.error({
-                message: msg,
-            })
-        }else if (code === 401) {
-            Message.error({
-                message: msg,
-            })
-            // setTimeout(() => {
-            //     location.href = process.env.VUE_APP_API_portal_URL + "/#/";
-            //   }, 2000);
-        }
-        
-    }
-    return response
-}, err => {
-    if (err.message.includes('timeout')) {
+      // 取出数据
+      let { code, msg } = response.data;
+      if (code === -1) {
+        Message.error({
+          message: msg,
+        });
+      } else if (code === 401) {
         Message.error({
-            message: '请求超时，请稍后再试',
-        })
+          message: msg,
+        });
+        setTimeout(() => {
+          location.href = process.env.VUE_APP_API_portal_URL + "/#/";
+        }, 2000);
+      }
+    }
+    return response;
+  },
+  (err) => {
+    if (err.message.includes("timeout")) {
+      Message.error({
+        message: "请求超时，请稍后再试",
+      });
     }
-    return Promise.reject(err)
-})
+    return Promise.reject(err);
+  }
+);
 
-export default axios
+export default axios;
\ No newline at end of file