fix(证照管理) 页面优化

src/views/qualityControl/approval.vue

@@ -42,7 +42,7 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="企业属性" align="center" prop="companyAttributes">
             <template slot-scope="scope">
-                {{ scope.row.companyAttributes == '1' ?  '客户' : scope.row.companyAttributes == '2' ? '供应商' : scope.row.companyAttributes == '3' ? '客户和供应商' : '未知' }}
+                {{ scope.row.companyAttributes == '1' ?  '客户' : scope.row.companyAttributes == '0' ? '供应商' : '未知' }}
             </template>
         </el-table-column>
         <el-table-column label="企业名称" align="center" prop="companyName" />
@@ -54,7 +54,7 @@
         <el-table-column label="有效期至" align="center" prop="validUntil" />
         <el-table-column label="工单状态" align="center" prop="workState">
             <template slot-scope="scope">
-                {{ scope.row.workState == '1' ?  '草稿' : scope.row.workState == '2' ? '审批中' : scope.row.workState == '3' ? '已审批' : '未知' }}
+                {{ scope.row.workState == '1' ?  '草稿' : scope.row.workState == '2' ? '审批中' : scope.row.workState == '3' ? '已审批' : '待处理' }}
             </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -198,7 +198,7 @@
             // 客户
             this.$router.push({ path: '/qualityControl/khDetail',  query:{'companyCode': row.companyId, 'licenseNumber': row.id, 'isFlag': false} });
         }
-        if(row.companyAttributes == '2'){
+        if(row.companyAttributes == '0'){
             // 供应商
             this.$router.push({ path: '/qualityControl/gysDetail',  query:{'companyCode': row.companyId, 'licenseNumber': row.id, 'isFlag': false} });
         }
@@ -214,7 +214,7 @@
             // 客户
             this.$router.push({ path: '/qualityControl/khDetail',  query:{'companyCode': row.companyId, 'licenseNumber': row.id, 'isFlag': true} });
         }
-        if(row.companyAttributes == '2'){
+        if(row.companyAttributes == '0'){
             // 供应商
             this.$router.push({ path: '/qualityControl/gysDetail',  query:{'companyCode': row.companyId, 'licenseNumber': row.id, 'isFlag': true} });
         }

src/views/qualityControl/approved.vue

@@ -42,7 +42,7 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="企业属性" align="center" prop="companyAttributes">
             <template slot-scope="scope">
-                {{ scope.row.companyAttributes == '1' ?  '客户' : scope.row.companyAttributes == '2' ? '供应商' : scope.row.companyAttributes == '3' ? '客户和供应商' : '未知' }}
+              {{ scope.row.companyAttributes == '1' ?  '客户' : scope.row.companyAttributes == '0' ? '供应商' : '未知' }}
             </template>
         </el-table-column>
         <el-table-column label="企业名称" align="center" prop="companyName" />
@@ -193,7 +193,7 @@
             // 客户
             this.$router.push({ path: '/qualityControl/khDetail',  query:{'companyCode': row.companyId, 'licenseNumber': row.id, 'isFlag': false} });
         }
-        if(row.companyAttributes == '2'){
+        if(row.companyAttributes == '0'){
             // 供应商
             this.$router.push({ path: '/qualityControl/gysDetail',  query:{'companyCode': row.companyId, 'licenseNumber': row.id, 'isFlag': false} });
         }
@@ -209,7 +209,7 @@
             // 客户
             this.$router.push({ path: '/qualityControl/khDetail',  query:{'companyCode': row.companyId, 'licenseNumber': row.id, 'isFlag': true} });
         }
-        if(row.companyAttributes == '2'){
+        if(row.companyAttributes == '0'){
             // 供应商
             this.$router.push({ path: '/qualityControl/gysDetail',  query:{'companyCode': row.companyId, 'licenseNumber': row.id, 'isFlag': true} });
         }

src/views/qualityControl/gysDetail.vue

@@ -109,28 +109,23 @@
                         </el-select>
                     </span>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="6">
                     <span>证照编号：<el-input v-model="form.licenseNumber" placeholder="请输入证照编号" style="width: 60%" :disabled="isFlag"/></span>
                 </el-col>
                 <el-col :span="6">
                     <span>证照名称：<el-input v-model="form.licenseName" placeholder="请输入证照名称" style="width: 60%" :disabled="isFlag"/></span>
                 </el-col>
+                <el-col :span="6">
+                    <span>颁证机构：<el-input v-model="form.licenseCompany" placeholder="请输入颁证机构" style="width: 60%" :disabled="isFlag"/></span>
+                </el-col>
             </el-form-item> 
             <el-form-item>
                 <el-col :span="5">
-                    <span>颁证机构：<el-input v-model="form.licenseCompany" placeholder="请输入颁证机构" style="width: 60%" :disabled="isFlag"/></span>
-                </el-col>
-                <el-col :span="6">
                     <span>颁发日期：<el-input v-model="form.licenseDate" placeholder="请输入颁发日期" style="width: 60%" :disabled="isFlag"/></span>
                 </el-col>
                 <el-col :span="6">
                     <span>经营方式：<el-input v-model="form.businessType" placeholder="请输入经营方式" style="width: 60%" :disabled="isFlag"/></span>
                 </el-col>
-                <el-col :span="6">
-                    <span>经营范围：<el-input v-model="form.businessScope" placeholder="请输入经营范围" style="width: 60%" :disabled="isFlag"/></span>
-                </el-col>
-            </el-form-item> 
-            <el-form-item>
                 <el-col :span="5">
                     <span>
                         有效期至：
@@ -145,7 +140,9 @@
                 <el-col :span="6">
                     <span>预警天数：<el-input v-model="form.warningDays" placeholder="请输入预警天数" style="width: 60%" :disabled="isFlag"/></span>
                 </el-col>
-                <el-col :span="12">
+            </el-form-item> 
+            <el-form-item>
+                <el-col>
                     <span>备注：<el-input v-model="form.remark" placeholder="请输入备注" style="width: 60%" :disabled="isFlag"/></span>
                 </el-col>
             </el-form-item> 
@@ -181,7 +178,19 @@
                     label="范围层级"
                     width="240">
                         <template slot-scope="scope">
-                            <el-input v-model="scope.row.scopeLevel" placeholder="请输入范围层级" :disabled="isFlag"></el-input>
+                            <el-select
+                                clearable
+                                v-model="scope.row.scopeLevel"
+                                :disabled="isFlag"
+                            >
+                                <el-option
+                                v-for="level in scopeLevelList"
+                                :key="level.value"
+                                :label="level.label"
+                                :value="level.value"
+                                >
+                                </el-option>
+                            </el-select>
                         </template>
                     </el-table-column>
                     <el-table-column
@@ -297,33 +306,24 @@ export default {
           value: '选项5',
           label: '北京烤鸭'
         }],
+        scopeLevelList: [
+        { 
+          value: '1',
+          label: '类别'
+        },
+        {
+          value: '2',
+          label: '剂型'
+        },
+        {
+          value: '3',
+          label: '物料'
+        }
+        ],
         value: '',
         value1: '',
-        imgList: [
-            {
-                id: '1',
-                filename: 'AAA',
-                filepath: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
-                srcList: [
-                'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg'
-                ]
-            },
-            {
-                id: '2',
-                filename: 'BBB',
-                filepath: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
-                srcList: [
-                'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg'
-                ]
-            }
-        ],
-        tableData: [{
-            id:'1',
-            scopeLevel: '2016-05-02',
-            code: '王1虎',
-            name: '上海市普陀区金沙江路 1518 弄',
-            remark: '1123'
-          }],
+        imgList: [],
+        tableData: [],
         companyCode: '',
         licenseNumber: '',
         fileList: [],
@@ -510,39 +510,65 @@ export default {
                     let lines = ocrs[0].lines;
                     lines.forEach((element,index) => {
                         console.log("A:::" + element.text)
-                        if(element.text.includes('许可证编号')||element.text.includes('证照编号')){
-                            this.form.licenseNumber = element.text.substr(6);
-                            if(!lines[index+1].text.includes(":")){
-                                this.form.licenseNumber += lines[index+1].text;
+                        if(element.text.includes('许可证编号')){
+                            if(element.text.includes(':')){
+                                this.form.licenseNumber = element.text.substr(6);
+                            }else{
+                                this.form.licenseNumber = element.text.substr(5);
                             }
+                            this.form.licenseNumber = this.form.licenseNumber.split(' ').join('')
                         }
-                        if((element.text.includes('许可证') && !element.text.includes('编号')) || element.text.includes('证照名称')){
+                        if(element.text.includes('许可证') && !element.text.includes('编号')){
                             this.form.licenseName = element.text;
-                            if(!lines[index+1].text.includes(":")){
-                                this.form.licenseName += lines[index+1].text;
-                            }
+                            this.form.licenseName = this.form.licenseName.split(' ').join('')
                         }
-                        if(element.text.includes('发证部门')||element.text.includes('颁证机构')){
-                            this.form.licenseCompany = element.text.substr(5);
+                        if(element.text.includes('发证机关')||element.text.includes('发证部门')||element.text.includes('颁证机构')){
+                            if(element.text.includes(':')){
+                                this.form.licenseCompany = element.text.substr(5);
+                            }else{
+                                this.form.licenseCompany = element.text.substr(4);
+                            }
                             if(!lines[index+1].text.includes(":")){
                                 this.form.licenseCompany += lines[index+1].text;
                             }
+                            this.form.licenseCompany = this.form.licenseCompany.split(' ').join('').split(',').join('')
                         }
                         if(element.text.includes('生产方式') || element.text.includes('经营方式')){
-                            this.form.businessType = element.text.substr(5);
+                            if(element.text.includes(':')){
+                                this.form.businessType = element.text.substr(5);
+                            }else{
+                                this.form.businessType = element.text.substr(4);
+                            }
                             if(!lines[index+1].text.includes(":")){
                                 this.form.businessType += lines[index+1].text;
                             }
+                            this.form.businessType = this.form.businessType.split(' ').join('')
                         }
-                        if(element.text.includes('生产范围') || element.text.includes('经营范围')){
-                            this.form.businessScope = element.text.substr(5);
-                            if(!lines[index+1].text.includes(":")){
-                                this.form.businessScope += lines[index+1].text;
+                        if(element.text.includes('有效期限') && !element.text.includes('至')){
+                            let wb = '';
+                            if(element.text.includes(':')){
+                                wb = element.text.substr(5);
+                                if(wb != ''){
+                                    wb = wb.replace('年','-');
+                                    wb = wb.replace('月','-');
+                                    wb = wb.replace('日','');
+                                    wb = wb.split(' ').join('')
+                                    this.form.validUntil = wb;
+                                }
+                            }else{
+                                wb = element.text.substr(4);
+                                if(wb != ''){
+                                    wb = wb.replace('年','-');
+                                    wb = wb.replace('月','-');
+                                    wb = wb.replace('日','');
+                                    wb = wb.split(' ').join('')
+                                    this.form.validUntil = wb;
+                                }
                             }
                         }
                         if(element.text.includes('至')){
                             let wb = '';
-                            wb = element.text.substr(2);
+                            wb = element.text.substr(1);
                             if(wb != ''){
                                 wb = wb.replace('年','-');
                                 wb = wb.replace('月','-');
@@ -551,12 +577,31 @@ export default {
                                 this.form.validUntil = wb;
                             }
                         }
+                        if(element.text.includes('发证日期')){
+                            let wb = '';
+                            if(element.text.includes(':')){
+                                wb = element.text.substr(5);
+                                if(wb != ''){
+                                    wb = wb.replace('年','-');
+                                    wb = wb.replace('月','-');
+                                    wb = wb.replace('日','');
+                                    wb = wb.split(' ').join('')
+                                    this.form.licenseDate = wb;
+                                }
+                            }else{
+                                wb = element.text.substr(4);
+                                if(wb != ''){
+                                    wb = wb.replace('年','-');
+                                    wb = wb.replace('月','-');
+                                    wb = wb.replace('日','');
+                                    wb = wb.split(' ').join('')
+                                    this.form.licenseDate = wb;
+                                }
+                            }
+                        }
                     });
                 }
             }
-            
-            // 
-
         },
     },
   };

src/views/qualityControl/khDetail.vue

@@ -59,28 +59,23 @@
                         </el-select>
                     </span>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="6">
                     <span>证照编号：<el-input v-model="form.licenseNumber" placeholder="请输入证照编号" style="width: 60%" :disabled="isFlag"/></span>
                 </el-col>
                 <el-col :span="6">
                     <span>证照名称：<el-input v-model="form.licenseName" placeholder="请输入证照名称" style="width: 60%" :disabled="isFlag"/></span>
                 </el-col>
+                <el-col :span="6">
+                    <span>颁证机构：<el-input v-model="form.licenseCompany" placeholder="请输入颁证机构" style="width: 60%" :disabled="isFlag"/></span>
+                </el-col>
             </el-form-item> 
             <el-form-item>
                 <el-col :span="5">
-                    <span>颁证机构：<el-input v-model="form.licenseCompany" placeholder="请输入颁证机构" style="width: 60%" :disabled="isFlag"/></span>
-                </el-col>
-                <el-col :span="6">
                     <span>颁发日期：<el-input v-model="form.licenseDate" placeholder="请输入颁发日期" style="width: 60%" :disabled="isFlag"/></span>
                 </el-col>
                 <el-col :span="6">
                     <span>经营方式：<el-input v-model="form.businessType" placeholder="请输入经营方式" style="width: 60%" :disabled="isFlag"/></span>
                 </el-col>
-                <el-col :span="6">
-                    <span>经营范围：<el-input v-model="form.businessScope" placeholder="请输入经营范围" style="width: 60%" :disabled="isFlag"/></span>
-                </el-col>
-            </el-form-item> 
-            <el-form-item>
                 <el-col :span="5">
                     <span>
                         有效期至：
@@ -95,7 +90,9 @@
                 <el-col :span="6">
                     <span>预警天数：<el-input v-model="form.warningDays" placeholder="请输入预警天数" style="width: 60%" :disabled="isFlag"/></span>
                 </el-col>
-                <el-col :span="12">
+            </el-form-item> 
+            <el-form-item>
+                <el-col>
                     <span>备注：<el-input v-model="form.remark" placeholder="请输入备注" style="width: 60%" :disabled="isFlag"/></span>
                 </el-col>
             </el-form-item> 
@@ -131,7 +128,19 @@
                     label="范围层级"
                     width="240">
                         <template slot-scope="scope">
-                            <el-input v-model="scope.row.scopeLevel" placeholder="请输入范围层级" :disabled="isFlag"></el-input>
+                            <el-select
+                                clearable
+                                v-model="scope.row.scopeLevel"
+                                :disabled="isFlag"
+                            >
+                                <el-option
+                                v-for="level in scopeLevelList"
+                                :key="level.value"
+                                :label="level.label"
+                                :value="level.value"
+                                >
+                                </el-option>
+                            </el-select>
                         </template>
                     </el-table-column>
                     <el-table-column
@@ -246,39 +255,24 @@ export default {
           value: '选项5',
           label: '北京烤鸭'
         }],
+        scopeLevelList: [
+        { 
+          value: '1',
+          label: '类别'
+        },
+        {
+          value: '2',
+          label: '剂型'
+        },
+        {
+          value: '3',
+          label: '物料'
+        }
+        ],
         value: '',
         value1: '',
-        imgList: [
-            {
-                id: '1',
-                filename: 'AAA',
-                filepath: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
-                srcList: [
-                'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg'
-                ]
-            },
-            {
-                id: '2',
-                filename: 'BBB',
-                filepath: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
-                srcList: [
-                'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg'
-                ]
-            }
-        ],
-        tableData: [{
-            id:'1',
-            one: '2016-05-02',
-            two: '王1虎',
-            three: '上海市普陀区金沙江路 1518 弄',
-            four: '1123'
-          }, {
-            id:'2',
-            one: '2016-05-02',
-            two: '王2虎',
-            three: '上海市普陀区金沙江路 1518 弄',
-            four: '1123'
-          }],
+        imgList: [],
+        tableData: [],
         companyCode: '',
         licenseNumber: '',
         fileList: [],