合并分支 'zax' 到 'master'

src/components/admittance/company/company.vue

@@ -139,7 +139,6 @@ export default {
             if (val !== 'page') { // 点击搜索按钮，不是点击分页跳转
                 this.currentPage = 1;
                 message.name = this.searchName;
-                console.log(this.classVal)
                 message.type = change[this.classVal];
             }
             let data = {
@@ -150,9 +149,9 @@ export default {
 
             this.$server.postUnitSearchAccess(data).then(res => {
                 this.allData = res.data.data.rows;
-                this.totalLength =  this.allData.length;
+                this.totalLength = res.data.data.total;
             }).catch(err => {
-              this.$message.error('数据请求失败！');
+                this.$message.error('数据请求失败！');
             })
         },
         // 点击分页

src/components/admittance/company/companyDetails.vue

@@ -5,7 +5,7 @@
         <div class="content">
           <el-row>
             <el-col :span="9">
-              <p class="title">单位信息</p>
+              <p class="title"><span class="backImg" @click="backPath"></span><span class="title-text">单位信息</span></p>
               <p class="search">
                 <span class="value">
                     <span>单位名称：</span>
@@ -30,14 +30,14 @@
                <span class="status">
                  <span>单位类别：</span>
                <img src="../person/img/click.png" style="width: 21px;height: 21px;">
-               <span>{{typeChange(data.type)}}</span>
+               <span class="text">{{typeChange(data.type)}}</span>
                </span>
               </p>
               <p class="search">
               <span class="status">
                  <span>是否准入：</span>
                <img src="../person/img/click.png" style="width: 21px;height: 21px;">
-               <span>{{statusChange(data.status)}}</span>
+               <span class="text">{{statusChange(data.status)}}</span>
               </span>
               </p>
             </el-col>
@@ -85,6 +85,10 @@ export default {
         personPage () {
             console.log(this.data)
             this.$router.push({name: 'person',params:{'value': this.data}});
+        },
+        // 页面返回
+        backPath () {
+            this.$router.push({name: 'company'});
         }
     }
 }
@@ -176,4 +180,21 @@ export default {
     color: #fff;
     font-size: 18px;
   }
+  .details .content .text{
+    margin-left: 5px;
+  }
+  .details .content .backImg{
+    width: 25px;
+    height: 25px;
+    position: absolute;
+    cursor: pointer;
+    background-image: url("../../../assets/img/back.png");
+  }
+  .details .content .backImg:hover{
+    background-image: url("../../../assets/img/back-select.png");
+  }
+  .details .content .title-text{
+    margin-left: 29px;
+    vertical-align: middle;
+  }
 </style>
\ No newline at end of file

src/components/admittance/product/newProduct.vue

@@ -7,18 +7,18 @@
       <p class="new">
         <span class="addVal">
             <span>产品名称：</span>
-            <el-input v-model="name" size="medium" placeholder="请输入"></el-input>
+            <el-input v-model="name" size="medium" :disabled="!authority" placeholder="请输入"></el-input>
         </span>
         <span class="addVal">
             <span>产品分类：</span>
-            <el-radio-group v-model="type" size="small" style="padding-top: 11px;width: 100%;text-align: left">
+            <el-radio-group v-model="type" :disabled="!authority" size="small" style="padding-top: 11px;width: 100%;text-align: left">
               <el-radio label="1">软件 </el-radio>
               <el-radio label="2">硬件</el-radio>
             </el-radio-group>
         </span>
         <span class="addVal">
             <span>产品类型：</span>
-            <el-radio-group v-model="form" size="small" style="padding-top: 11px; width: 100%;text-align: left">
+            <el-radio-group v-model="form" :disabled="!authority" size="small" style="padding-top: 11px; width: 100%;text-align: left">
               <el-radio label="1" style="margin-bottom: 11px;">服务器</el-radio>
               <el-radio label="2" style="margin-bottom: 11px;">CPU</el-radio>
               <el-radio label="3" style="margin-bottom: 11px;">操作系统</el-radio>
@@ -29,15 +29,15 @@
         </span>
         <span class="addVal">
             <span>产品型号：</span>
-            <el-input v-model="model" size="medium" placeholder="请输入"></el-input>
+            <el-input v-model="model" :disabled="!authority" size="medium" placeholder="请输入"></el-input>
         </span>
         <span class="addVal">
             <span>厂商：</span>
-            <el-input v-model="producer" size="medium" placeholder="请输入"></el-input>
+            <el-input v-model="producer" :disabled="!authority" size="medium" placeholder="请输入"></el-input>
         </span>
         <span class="addVal">
             <span>是否准入：</span>
-            <el-radio-group v-model="status" size="small" style="padding-top: 11px; width: 100%;text-align: left">
+            <el-radio-group v-model="status" :disabled="!authority" size="small" style="padding-top: 11px; width: 100%;text-align: left">
               <el-radio label="1">是</el-radio>
               <el-radio label="-1">否</el-radio>
             </el-radio-group>
@@ -46,8 +46,8 @@
     </div>
     <p class="line"></p>
     <p class="buttonClick">
-      <span class="buttonCancl" @click="cancel">取消</span>
-      <span class="buttonSave" @click="save">确定</span>
+      <span class="buttonCancl" v-if="authority" @click="cancel">取消</span>
+      <span class="buttonSave" v-if="authority" @click="save">确定</span>
     </p>
   </div>
 </template>
@@ -65,12 +65,16 @@ export default {
             form: '',
             productList: [],
             text: '',
-            producer: ''
+            producer: '',
+            authority: true
         }
     },
     created() {
     },
     mounted(){
+        if (this.$store.getters.getSidebar.name === '市级名录') {
+            this.authority = false;
+        }
         if (this.productName === '产品信息') {
             this.productList = this.list;
             this.name = this.productList.name;
@@ -166,4 +170,14 @@ export default {
   .newCompany .company-content>>>.el-input__inner{
     width: 290px;
   }
+  .newCompany .company-content>>>.el-radio__input.is-checked + .el-radio__label{
+    color: #409eff;
+  }
+  .newCompany .company-content>>>.el-radio__input.is-disabled.is-checked .el-radio__inner{
+    border-color: #409EFF;
+    background: #409EFF;
+  }
+  .newCompany .company-content>>>.el-radio__input.is-disabled.is-checked .el-radio__inner::after{
+    background-color: #ffffff;
+  }
 </style>

src/components/admittance/product/product.vue

@@ -130,7 +130,7 @@ export default {
             this.$server.getTechFindAll().then(res => { // 请求技术路线
                 this.techList = res.data.data
             }).catch(err => {
-              this.$message.error('数据请求失败！');
+                this.$message.error('数据请求失败！');
             })
         },
         // 技术路线值转换
@@ -169,7 +169,7 @@ export default {
                 '其他': 6
             }
             if (val === 'search') {
-                this.page = 1;
+                this.currentPage = 1;
                 message.name = this.name;
                 this.techList.map(item => {
                     if (item.name === this.techVal) {
@@ -179,16 +179,15 @@ export default {
                 message.form = change[this.formValue]
             }
             let data = {
-                page: this.page,
+                page: this.currentPage,
                 pageSize: this.pageSize,
                 t: message
             };
-            console.log(data)
             this.$server.postProduceSearchAccess(data).then(res => {
                 this.allData = res.data.data.rows;
-                this.totalLength = this.allData.length;
+                this.totalLength = res.data.data.total;
             }).catch(err => {
-              this.$message.error('数据请求失败！');
+                this.$message.error('数据请求失败！');
             })
         },
         // 点击分页
@@ -222,12 +221,6 @@ export default {
             this.components = 'newProduct';
             this.productName = '产品信息';
             this.productList = row;
-        },
-        // 技术路线信息
-        technology(row) {
-            this.openModel = true;
-            this.components = 'technology';
-            this.productList = row;
         }
     }
 }

src/components/basicInformation/company/company.vue

@@ -20,13 +20,13 @@
               </el-select>
             </span>
             <span class="button searchBtn">搜索</span>
-            <span class="button add" @click="addCompany"><img src="../../../assets/img/add.png"></span>
-            <span class="button import"><img src="../../../assets/img/import.png">
+            <span class="button add" v-if="authority" @click="addCompany"><img src="../../../assets/img/add.png"></span>
+            <span class="button import" v-if="authority" ><img src="../../../assets/img/import.png">
             <el-upload
               style="margin-top: -35px;"
               class="upload-demo"
               action="https://jsonplaceholder.typicode.com/posts/"
-              :on-change="uploadFile">
+              :before-upload="uploadFile">
               <el-button size="small" type="primary" style="width: 100px;height: 34px;background-color: rgba(0,0,0,0);border: none"></el-button>
             </el-upload>
             </span>
@@ -121,7 +121,8 @@ export default {
                 '6': '专家',
                 '7': '测试机构',
                 '8': '开发商'
-            }
+            },
+            authority: true
         }
     },
     components: {
@@ -129,6 +130,9 @@ export default {
     },
     mounted() {
         this.search('page')
+        if (this.$store.getters.getSidebar.name === '国家名录') {
+            this.authority = false
+        }
     },
     methods: {
         // 单位搜索
@@ -166,9 +170,9 @@ export default {
 
             this.$server.postUnitSearch(data).then(res => {
                 this.allData = res.data.data.rows;
-                this.totalLength =  this.allData.length;
+                this.totalLength = res.data.data.total;
             }).catch(err => {
-              this.$message.error('数据请求失败！');
+                this.$message.error('数据请求失败！');
             })
         },
         // 点击分页
@@ -211,7 +215,7 @@ export default {
         // 单位导入
         uploadFile (file){
             let formdata = new FormData();
-            formdata.append('file', file.raw);
+            formdata.append('file', file);
             this.$server.postUnitLoad(formdata).then(res => {
                 if (res.data.msg === 'OK') {
                     this.$message.success('导入单位成功！');

src/components/basicInformation/company/companyDetails.vue

@@ -5,7 +5,7 @@
        <div class="content">
          <el-row>
            <el-col :span="9">
-             <p class="title">单位信息</p>
+             <p class="title"><span class="backImg" @click="backPath"></span><span class="title-text">单位信息</span></p>
              <p class="search">
                 <span class="value">
                     <span>单位名称：</span>
@@ -30,14 +30,14 @@
                <span class="status">
                  <span>单位类别：</span>
                <img src="../person/img/click.png" style="width: 21px;height: 21px;">
-               <span>{{typeChange(data.type)}}</span>
+               <span class="text">{{typeChange(data.type)}}</span>
                </span>
              </p>
              <p class="search">
               <span class="status">
                  <span>是否准入：</span>
                <img src="../person/img/click.png" style="width: 21px;height: 21px;">
-               <span>{{statusChange(data.status)}}</span>
+               <span class="text">{{statusChange(data.status)}}</span>
               </span>
              </p>
            </el-col>
@@ -85,6 +85,10 @@ export default {
         personPage () {
             console.log(this.data)
             this.$router.push({name: 'person',params:{'value': this.data}});
+        },
+        // 页面返回
+        backPath () {
+            this.$router.push({name: 'company'});
         }
     }
 }
@@ -176,4 +180,22 @@ export default {
     color: #fff;
     font-size: 18px;
   }
+  .details .content .text{
+    margin-left: 5px;
+  }
+  /*返回按钮*/
+  .details .content .backImg{
+    width: 25px;
+    height: 25px;
+    position: absolute;
+    cursor: pointer;
+    background-image: url("../../../assets/img/back.png");
+  }
+  .details .content .backImg:hover{
+    background-image: url("../../../assets/img/back-select.png");
+  }
+  .details .content .title-text{
+    margin-left: 29px;
+    vertical-align: middle;
+  }
 </style>
\ No newline at end of file

src/components/basicInformation/product/newProduct.vue

@@ -7,18 +7,18 @@
       <p class="new">
         <span class="addVal">
             <span>产品名称：</span>
-            <el-input v-model="name" size="medium" placeholder="请输入"></el-input>
+            <el-input v-model="name" size="medium" placeholder="请输入" :disabled="!authority"></el-input>
         </span>
         <span class="addVal">
             <span>产品分类：</span>
-            <el-radio-group v-model="type" size="small" style="padding-top: 11px;width: 100%;text-align: left">
+            <el-radio-group v-model="type" :disabled="!authority" size="small" style="padding-top: 11px;width: 100%;text-align: left">
               <el-radio label="1">软件 </el-radio>
               <el-radio label="2">硬件</el-radio>
             </el-radio-group>
         </span>
         <span class="addVal">
             <span>产品类型：</span>
-            <el-radio-group v-model="form" size="small" style="padding-top: 11px; width: 100%;text-align: left">
+            <el-radio-group v-model="form" :disabled="!authority" size="small" style="padding-top: 11px; width: 100%;text-align: left">
               <el-radio label="1" style="margin-bottom: 11px;">服务器</el-radio>
               <el-radio label="2" style="margin-bottom: 11px;">CPU</el-radio>
               <el-radio label="3" style="margin-bottom: 11px;">操作系统</el-radio>
@@ -29,15 +29,15 @@
         </span>
         <span class="addVal">
             <span>产品型号：</span>
-            <el-input v-model="model" size="medium" placeholder="请输入"></el-input>
+            <el-input v-model="model" :disabled="!authority" size="medium" placeholder="请输入"></el-input>
         </span>
         <span class="addVal">
             <span>厂商：</span>
-            <el-input v-model="producer" size="medium" placeholder="请输入"></el-input>
+            <el-input v-model="producer" :disabled="!authority" size="medium" placeholder="请输入"></el-input>
         </span>
         <span class="addVal">
             <span>是否准入：</span>
-            <el-radio-group v-model="status" size="small" style="padding-top: 11px; width: 100%;text-align: left">
+            <el-radio-group v-model="status" :disabled="!authority" size="small" style="padding-top: 11px; width: 100%;text-align: left">
               <el-radio label="1">是</el-radio>
               <el-radio label="-1">否</el-radio>
             </el-radio-group>
@@ -46,15 +46,15 @@
     </div>
     <p class="line"></p>
     <p class="buttonClick">
-      <span class="buttonCancl" @click="cancel">取消</span>
-      <span class="buttonSave" @click="save">确定</span>
+      <span class="buttonCancl" v-if="authority" @click="cancel">取消</span>
+      <span class="buttonSave" v-if="authority" @click="save">确定</span>
     </p>
   </div>
 </template>
 
 <script>
 export default {
-    props: ['productName','list'],
+    props: ['productName','list','authority'],
     data () {
         return {
             type: '',
@@ -166,4 +166,14 @@ export default {
   .newCompany .company-content>>>.el-input__inner{
     width: 290px;
   }
+  .newCompany .company-content>>>.el-radio__input.is-checked + .el-radio__label{
+    color: #409eff;
+  }
+  .newCompany .company-content>>>.el-radio__input.is-disabled.is-checked .el-radio__inner{
+    border-color: #409EFF;
+    background: #409EFF;
+  }
+  .newCompany .company-content>>>.el-radio__input.is-disabled.is-checked .el-radio__inner::after{
+    background-color: #ffffff;
+  }
 </style>

src/components/basicInformation/product/product.vue

@@ -32,13 +32,13 @@
               </el-select>
             </span>
             <span class="button searchBtn" @click="search('search')">搜索</span>
-            <span class="button add" @click="addProduct"><img src="../../../assets/img/add.png"></span>
-            <span class="button import"><img src="../../../assets/img/import.png">
+            <span class="button add" v-if="authority" @click="addProduct"><img src="../../../assets/img/add.png"></span>
+            <span class="button import" v-if="authority" ><img src="../../../assets/img/import.png">
                <el-upload
                  style="margin-top: -35px;"
                  class="upload-demo"
                  action="https://jsonplaceholder.typicode.com/posts/"
-                 :on-change="uploadFile">
+                 :before-upload="uploadFile">
               <el-button size="small" type="primary" style="width: 100px;height: 34px;background-color: rgba(0,0,0,0);border: none"></el-button>
             </el-upload>
             </span>
@@ -95,7 +95,7 @@
     <!-- 新增 / 编辑 公用弹窗 -->
     <el-dialog :visible.sync="openModel" class="model">
       <img src="../../../assets/img/close.png" class="closeModel" @click="reset()">
-      <component :is="components" :productName="productName" :list="productList" :techList="techList" @on-cancel="reset" @on-name="getName"></component>
+      <component :is="components" :productName="productName" :list="productList" :authority="authority" @on-cancel="reset" @on-name="getName"></component>
     </el-dialog>
   </div>
 </template>
@@ -127,7 +127,8 @@ export default {
             components: '', // 当前弹框内容
             productName: '',
             productList: '',
-            allData: []
+            allData: [],
+            authority: true
         }
     },
     components: {
@@ -137,6 +138,9 @@ export default {
     mounted() {
         this.init();
         this.search();
+        if (this.$store.getters.getSidebar.name === '国家名录') {
+            this.authority = false
+        }
     },
     methods: {
         init() {
@@ -146,7 +150,7 @@ export default {
             this.$server.getTechFindAll().then(res => { // 请求技术路线
                 this.techList = res.data.data
             }).catch(err => {
-              this.$message.error('数据请求失败！');
+                this.$message.error('数据请求失败！');
             })
         },
         // 技术路线值转换
@@ -189,7 +193,7 @@ export default {
                 '其他': 6
             }
             if (val === 'search') {
-                this.page = 1;
+                this.currentPage = 1;
                 message.name = this.name;
                 this.techList.map(item => {
                     if (item.name === this.techVal) {
@@ -199,16 +203,16 @@ export default {
                 message.form = change[this.formValue]
             }
             let data = {
-                page: this.page,
+                page: this.currentPage,
                 pageSize: this.pageSize,
                 t: message
             };
             console.log(data)
             this.$server.postProduceSearch(data).then(res => {
                 this.allData = res.data.data.rows;
-                this.totalLength = this.allData.length;
+                this.totalLength = res.data.data.total;
             }).catch(err => {
-              this.$message.error('数据请求失败！');
+                this.$message.error('数据请求失败！');
             })
         },
         // 点击分页
@@ -244,7 +248,7 @@ export default {
         // 产品导入
         uploadFile (file){
             let formdata = new FormData();
-            formdata.append('file', file.raw);
+            formdata.append('file', file);
             this.$server.postProduceUpload(formdata).then(res => {
                 if (res.data.msg === 'OK') {
                     this.$message.success('产品导入成功！');
@@ -263,12 +267,6 @@ export default {
             this.components = 'newProduct';
             this.productName = '产品信息';
             this.productList = row;
-        },
-        // 技术路线信息
-        technology(row) {
-            this.openModel = true;
-            this.components = 'technology';
-            this.productList = row;
         }
     }
 }

src/components/basicInformation/product/technology.vue

@@ -24,59 +24,59 @@
 </template>
 
 <script>
-    export default {
-        props: ['techList','list'],
-        data () {
-            return {
-                type: '',
-                name: '',
-                formList: {
-                    1: '服务器',
-                    2: 'CPU',
-                    3: '操作系统',
-                    4: '数据库',
-                    5: '中间件',
-                    6: '其他',
-                },
-                text: '',
-                techNameList: []
-            }
-        },
-        created() {
-        },
-        mounted(){
-            console.log(this.list.techId);
-            this.list.techId = 4;
-            if (this.list.techId === null) {
-                this.text = '该产品没有添加到技术路线'
-            } else {
-                this.techList.map(item => {
-                    if (item.id === this.list.techId) {
-                        this.name = item.name
-                    }
-                })
-                this.$server.getProduceFind(this.list).then(res => {
-                    console.log(res)
-                    this.techNameList = res.data.data
-                }).catch(err => {
-                  this.$message.error('数据请求失败！');
-                })
-            }
-        },
-        methods: {
-            cancel() {
-                this.$emit('on-cancel')
+export default {
+    props: ['techList','list'],
+    data () {
+        return {
+            type: '',
+            name: '',
+            formList: {
+                1: '服务器',
+                2: 'CPU',
+                3: '操作系统',
+                4: '数据库',
+                5: '中间件',
+                6: '其他',
             },
-            formChange(val) {
-                console.log(this.formList[val])
-                return this.formList[val]
-            }
-        },
-        components: {
+            text: '',
+            techNameList: []
+        }
+    },
+    created() {
+    },
+    mounted(){
+        console.log(this.list.techId);
+        this.list.techId = 4;
+        if (this.list.techId === null) {
+            this.text = '该产品没有添加到技术路线'
+        } else {
+            this.techList.map(item => {
+                if (item.id === this.list.techId) {
+                    this.name = item.name
+                }
+            })
+            this.$server.getProduceFind(this.list).then(res => {
+                console.log(res)
+                this.techNameList = res.data.data
+            }).catch(err => {
+              this.$message.error('数据请求失败！');
+            })
+        }
+    },
+    methods: {
+        cancel() {
+            this.$emit('on-cancel')
         },
-        watch: {
+        formChange(val) {
+            console.log(this.formList[val])
+            return this.formList[val]
         }
+    },
+    components: {
+    },
+    watch: {
     }
+}
 </script>
 <style scoped>
   .newCompany .new{

src/components/sidebar/sidebar.vue

@@ -19,13 +19,13 @@
                 </p>
             </div>
 
-            <div  v-if="this.$store.getters.getUserData.type !== 1">
+            <div @click="clickMenu('',4,'国家名录')"  v-if="this.$store.getters.getUserData.type !== 1">
                 <p class="menu">
                     <span class="font">国家名录</span>
                 </p>
             </div>
 
-            <div  v-if="this.$store.getters.getUserData.type !== 1">
+            <div @click="clickMenu('',5,'市级名录')"  v-if="this.$store.getters.getUserData.type !== 1">
                 <p class="menu">
                     <span class="font">市级名录</span>
                 </p>