2
3
lining 6 rokov pred
rodič
commit
0ca95010e7

+ 1 - 1
src/dashoo.cn/backend/api/conf/app.conf

@@ -85,7 +85,7 @@ callbackHost=http://36dcae10.ngrok.io
 
 goodsModuleHost=http://weed1.labsop.cn:9390/3,28f046b04ec1
 basisModuleHost=http://weed1.labsop.cn:9390/6,28f159601b19
-techModuleHost=http://weed1.labsop.cn:9390/4,28efba13116a
+techModuleHost=http://weed1.labsop.cn:9390/5,299cfc86c767
 goodsPdfHost=http://weed1.labsop.cn:9390/4,272c38746f9a
 basisPdfHost=http://weed1.labsop.cn:9390/6,272dc8ca68d1
 techPdfHost=http://weed1.labsop.cn:9390/1,272e1bdabf62

+ 1 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -1340,7 +1340,7 @@ func (this *OilSupplierController) GetDictListByStatus() {
 	dictList["ProOrgList"] = preorglist
 
 	var unitorglist []organize.Base_Organize
-	where := "Category='Unit' and ParentId in (100000001,100000176) and Id not in (100000004,100000003,100000002) "
+	where := "Category='Unit'and Id not in (100000004,100000003,100000002) "
 	orgsvc.GetEntities(&unitorglist, where)
 	dictList["UnitOrgList"] = unitorglist
 

+ 1 - 1
src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -501,7 +501,7 @@ func (this *OilCorporateInfoController) GetDictList() {
 func (this *OilCorporateInfoController) OrgLoginList() {
 	svc := organize.GetOrganizeService(utils.DBE)
 	var org []organize.Base_Organize
-	where := "Category='unit' and ParentId in (100000128,100000176) and Id not in (100000159,100000151,100000166)"
+	where := "Category='unit' and ParentId in (100000128,100000176) and Id not in (100000159,100000166)"
 	svc.GetEntities(&org, where)
 	var datainfo DataInfo
 	datainfo.Items = org

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

@@ -287,7 +287,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
       BusinessList, // 选择准入范围
       AuditbusList, // 待审核业务
       BasisInfo,
-      WfBackHistory,
+      WfHistory,
       ChooseAuditor
     },
     name: 'oiltechnologyserviceEdit',

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -207,7 +207,7 @@
   import {
     mapGetters
   } from 'vuex';
-  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import supplierapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/annualaudit'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -207,7 +207,7 @@
   import {
     mapGetters
   } from 'vuex';
-  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import supplierapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/annualaudit'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/index.vue

@@ -203,7 +203,7 @@
   import {
     mapGetters
   } from 'vuex';
-  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import supplierapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/annualaudit'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -206,7 +206,7 @@
   import {
     mapGetters
   } from 'vuex';
-  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import supplierapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/annualaudit'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -1293,7 +1293,7 @@ import fileapi from '@/api/oilsupplier/supplierfile'
           })
       },
       chooseAuditorShowFen () {
-        this.$refs['chooseAuditorFenchooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisibleFen = true
       },
       setAuditerFen (val, name) {

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/system/userrole.vue

@@ -597,7 +597,7 @@
         _this.userselectOptions = []
 
         for (let i = 0; i < this.selectedOptions.length; i++) {
-          this.userselectOptions.push(this.selectedOptions[i].id)
+          this.userselectOptions.push(this.selectedOptions[i].Id)
         }
         let useridlist = this.userselectOptions.join(',');
         let useridliststring = useridlist.toString()