年审变更遗留bug

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplierService.go

@@ -241,7 +241,6 @@ func (s *OilSupplierService) GetProcessInfoWithOrderBytbl(supplierTableName, sup
 
 	//获取总记录数
 	sqlCount := `select count(*) from ` + supplierCertTableName + ` a `
-	sqlCount += ` left join ` + supplierCertTableName + " b on b.SupplierId = a.Id"
 	sqlCount += ` where ` + where
 
 	var sql string

src/dashoo.cn/frontend_web/src/components/oilsupplier/chooseauditor.vue

@@ -148,7 +148,7 @@
         // }).catch(err => {
         //   console.error(err)
         // })
-
+        if (data){
         let deptid = data.id
         this.userOptions = []
         let auditstepcode = 'FIRST_TRIAL' // 初审人
@@ -160,6 +160,7 @@
         }).catch(err => {
           console.error(err)
         })
+      }
       },
       handleSelectionChange(row) {
         this.selectedOptions = row[row.length-1]

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -1720,6 +1720,12 @@
             let val2 = val.BeChangeInfo.replace('T', ' ')
             return val2.substring(0, 10)
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else {
           return val.BeChangeInfo
         }
@@ -1759,7 +1765,13 @@
             return '----'
           } else if (val.ChangeInfo === '5000-01-01T23:59:59+08:00') {
             return '永久'
-          } else {
+          } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
+        } else {
             let val2 = val.ChangeInfo.replace('T', ' ')
             return val2.substring(0, 10)
           }
@@ -1868,6 +1880,7 @@
               _this.infochangeForm.SelectItemName = '公司类型'
             } else if (_this.infochangeForm.SelectItem === 'SetupTime') {
               _this.infochangeForm.SelectItemName = '成立时间'
+              _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo.replace('T00:00:00Z', '')
             } else if (_this.infochangeForm.SelectItem === 'RegCapital') {
               _this.infochangeForm.BeChangeInfo = _this.infochangeForm.BeChangeInfo + ''
               _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo + ''
@@ -1910,6 +1923,10 @@
               _this.infochangeForm.SelectItemName = '行业特殊要求的认证证书'
             } else if (_this.infochangeForm.SelectItem === 'BusinessScope') {
               _this.infochangeForm.SelectItemName = '营业范围'
+            }else if (_this.infochangeForm.SelectItem === 'TjinNotify') {
+              _this.infochangeForm.SelectItemName = '进津备案通知书'
+            }else if (_this.infochangeForm.SelectItem === 'QualifCert') {
+              _this.infochangeForm.SelectItemName = '企业资质证书(编号 级别)'
             } else if (_this.infochangeForm.SelectItem === 'Remark') {
               _this.infochangeForm.SelectItemName = '备注'
             } else if (_this.infochangeForm.SelectItem === 'AllAddress') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/basicauditoperation.vue

@@ -1651,6 +1651,12 @@
             let val2 = val.BeChangeInfo.replace('T', ' ')
             return val2.substring(0, 10)
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else {
           return val.BeChangeInfo
         }
@@ -1694,6 +1700,12 @@
             let val2 = val.ChangeInfo.replace('T', ' ')
             return val2.substring(0, 10)
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else {
           return val.ChangeInfo
         }
@@ -1800,6 +1812,7 @@
               _this.infochangeForm.SelectItemName = '公司类型'
             } else if (_this.infochangeForm.SelectItem === 'SetupTime') {
               _this.infochangeForm.SelectItemName = '成立时间'
+              _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo.replace('T00:00:00Z', '')
             } else if (_this.infochangeForm.SelectItem === 'RegCapital') {
               _this.infochangeForm.BeChangeInfo = _this.infochangeForm.BeChangeInfo + ''
               _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo + ''
@@ -1842,6 +1855,10 @@
               _this.infochangeForm.SelectItemName = '行业特殊要求的认证证书'
             } else if (_this.infochangeForm.SelectItem === 'BusinessScope') {
               _this.infochangeForm.SelectItemName = '营业范围'
+            }else if (_this.infochangeForm.SelectItem === 'TjinNotify') {
+              _this.infochangeForm.SelectItemName = '进津备案通知书'
+            }else if (_this.infochangeForm.SelectItem === 'QualifCert') {
+              _this.infochangeForm.SelectItemName = '企业资质证书(编号 级别)'
             } else if (_this.infochangeForm.SelectItem === 'Remark') {
               _this.infochangeForm.SelectItemName = '备注'
             } else if (_this.infochangeForm.SelectItem === 'AllAddress') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -1690,6 +1690,12 @@ import apiCert from '@/api/oilsupplier/suppliercert'
           } else if (val.BeChangeInfo === '2') {
             return '二级'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else {
           return val.BeChangeInfo
         }
@@ -1739,6 +1745,12 @@ import apiCert from '@/api/oilsupplier/suppliercert'
           } else if (val.ChangeInfo === '2') {
             return '二级'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else {
           return val.ChangeInfo
         }
@@ -2000,6 +2012,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
               _this.infochangeForm.SelectItemName = '公司类型'
             } else if (_this.infochangeForm.SelectItem === 'SetupTime') {
               _this.infochangeForm.SelectItemName = '成立时间'
+              _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo.replace('T00:00:00Z', '')
             } else if (_this.infochangeForm.SelectItem === 'RegCapital') {
               _this.infochangeForm.BeChangeInfo = _this.infochangeForm.BeChangeInfo + ''
               _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo + ''
@@ -2042,6 +2055,10 @@ import apiCert from '@/api/oilsupplier/suppliercert'
               _this.infochangeForm.SelectItemName = '行业特殊要求的认证证书'
             } else if (_this.infochangeForm.SelectItem === 'BusinessScope') {
               _this.infochangeForm.SelectItemName = '营业范围'
+            }else if (_this.infochangeForm.SelectItem === 'TjinNotify') {
+              _this.infochangeForm.SelectItemName = '进津备案通知书'
+            }else if (_this.infochangeForm.SelectItem === 'QualifCert') {
+              _this.infochangeForm.SelectItemName = '企业资质证书(编号 级别)'
             } else if (_this.infochangeForm.SelectItem === 'Remark') {
               _this.infochangeForm.SelectItemName = '备注'
             } else if (_this.infochangeForm.SelectItem === 'AllAddress') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -1774,6 +1774,12 @@
           } else if (val.BeChangeInfo === '2') {
             return '二级'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else {
           return val.BeChangeInfo
         }
@@ -1823,6 +1829,12 @@
           } else if (val.ChangeInfo === '2') {
             return '二级'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else {
           return val.ChangeInfo
         }
@@ -2104,6 +2116,7 @@
               _this.infochangeForm.SelectItemName = '公司类型'
             } else if (_this.infochangeForm.SelectItem === 'SetupTime') {
               _this.infochangeForm.SelectItemName = '成立时间'
+              _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo.replace('T00:00:00Z', '')
             } else if (_this.infochangeForm.SelectItem === 'RegCapital') {
               _this.infochangeForm.BeChangeInfo = _this.infochangeForm.BeChangeInfo + ''
               _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo + ''
@@ -2130,6 +2143,10 @@
               _this.infochangeForm.SelectItemName = '银行信用等级'
             } else if (_this.infochangeForm.SelectItem === 'HseTraining') {
               _this.infochangeForm.SelectItemName = 'HSE审查培训'
+            }else if (_this.infochangeForm.SelectItem === 'TjinNotify') {
+              _this.infochangeForm.SelectItemName = '进津备案通知书'
+            }else if (_this.infochangeForm.SelectItem === 'QualifCert') {
+              _this.infochangeForm.SelectItemName = '企业资质证书(编号 级别)'
             } else if (_this.infochangeForm.SelectItem === 'QualitySystemCert') {
               _this.infochangeForm.SelectItemName = '质量管理体系认证情况及认证机构'
             } else if (_this.infochangeForm.SelectItem === 'ProductQualityCert') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -1614,6 +1614,12 @@
           } else if (val.BeChangeInfo === 'CNY') {
             return '人民币'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else {
           return val.BeChangeInfo
         }
@@ -1679,6 +1685,12 @@
           } else if (val.ChangeInfo === 'CNY') {
             return '人民币'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else {
           return val.ChangeInfo
         }
@@ -1811,6 +1823,7 @@
               _this.infochangeForm.SelectItemName = '公司类型'
             } else if (_this.infochangeForm.SelectItem === 'SetupTime') {
               _this.infochangeForm.SelectItemName = '成立时间'
+              _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo.replace('T00:00:00Z', '')
             } else if (_this.infochangeForm.SelectItem === 'RegCapital') {
               _this.infochangeForm.BeChangeInfo = _this.infochangeForm.BeChangeInfo + ''
               _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo + ''
@@ -1853,6 +1866,10 @@
               _this.infochangeForm.SelectItemName = '行业特殊要求的认证证书'
             } else if (_this.infochangeForm.SelectItem === 'BusinessScope') {
               _this.infochangeForm.SelectItemName = '营业范围'
+            }else if (_this.infochangeForm.SelectItem === 'TjinNotify') {
+              _this.infochangeForm.SelectItemName = '进津备案通知书'
+            }else if (_this.infochangeForm.SelectItem === 'QualifCert') {
+              _this.infochangeForm.SelectItemName = '企业资质证书(编号 级别)'
             } else if (_this.infochangeForm.SelectItem === 'Remark') {
               _this.infochangeForm.SelectItemName = '备注'
             } else if (_this.infochangeForm.SelectItem === 'AllAddress') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/techoperation.vue

@@ -1666,6 +1666,12 @@
           } else if (val.BeChangeInfo === 'CNY') {
             return '人民币'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.BeChangeInfo === '0') {
+            return '否'
+          } else if (val.BeChangeInfo === '1') {
+            return '是'
+          }
         } else {
           return val.BeChangeInfo
         }
@@ -1725,6 +1731,12 @@
           } else if (val.ChangeInfo === 'CNY') {
             return '人民币'
           }
+        } else if (val.SelectItem === 'HseTraining') {
+          if (val.ChangeInfo === '0') {
+            return '否'
+          } else if (val.ChangeInfo === '1') {
+            return '是'
+          }
         } else {
           return val.ChangeInfo
         }
@@ -1830,6 +1842,7 @@
               _this.infochangeForm.SelectItemName = '公司类型'
             } else if (_this.infochangeForm.SelectItem === 'SetupTime') {
               _this.infochangeForm.SelectItemName = '成立时间'
+              _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo.replace('T00:00:00Z', '')
             } else if (_this.infochangeForm.SelectItem === 'RegCapital') {
               _this.infochangeForm.BeChangeInfo = _this.infochangeForm.BeChangeInfo + ''
               _this.infochangeForm.ChangeInfo = _this.infochangeForm.ChangeInfo + ''
@@ -1872,6 +1885,10 @@
               _this.infochangeForm.SelectItemName = '行业特殊要求的认证证书'
             } else if (_this.infochangeForm.SelectItem === 'BusinessScope') {
               _this.infochangeForm.SelectItemName = '营业范围'
+            }else if (_this.infochangeForm.SelectItem === 'TjinNotify') {
+              _this.infochangeForm.SelectItemName = '进津备案通知书'
+            }else if (_this.infochangeForm.SelectItem === 'QualifCert') {
+              _this.infochangeForm.SelectItemName = '企业资质证书(编号 级别)'
             } else if (_this.infochangeForm.SelectItem === 'Remark') {
               _this.infochangeForm.SelectItemName = '备注'
             } else if (_this.infochangeForm.SelectItem === 'AllAddress') {

src/dashoo.cn/frontend_web/src/pages/select/processselect/index.vue

@@ -635,5 +635,8 @@
     resize: none;
     height: 70px;
   }
-
+  .el-pagination {
+    margin: 1rem 0 2rem;
+    text-align: right;
+  }
 </style>