前:注册资金

src/dashoo.cn/backend/api/controllers/casbin/user.go

@@ -440,10 +440,17 @@ func (this *UserController) EditUser() {
 			if str[0] == "100001250" && str[2] != "" {
 				var entity organize.Base_Organize
 				svc := organize.GetOrganizeService(utils.DBE)
-				svc.GetEntityById (str[2], &entity)
+				svc.GetEntityById(str[2], &entity)
 				userentity.UnitId,_ = strconv.Atoi(str[2])
 				userentity.Unit = entity.Fullname
 			}
+			if len(str) == 1 {
+				var entity organize.Base_Organize
+				svc := organize.GetOrganizeService(utils.DBE)
+				svc.GetEntityById(str[0], &entity)
+				userentity.UnitId,_ = strconv.Atoi(model.DepartmentId)
+				userentity.Unit = model.DepartmentName
+			}
 		}
 		var cols []string = []string{"Realname", "CompanyId", "DepartmentId", "DepartmentName", "Telephone", "Mobile", "Description", "Photo", "Modifieduserid", "Modifiedby", "Superior", "Unit", "UnitId"}
 

src/dashoo.cn/backend/api/controllers/rtx/rtx.go

@@ -1,9 +1,15 @@
 package rtx
 
 import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
+	"encoding/base64"
 	"encoding/json"
+	"encoding/pem"
 	"fmt"
 	"log"
+	"os"
 
 	"strconv"
 	"strings"
@@ -76,6 +82,9 @@ func (this *RtxController) PtrLogin() {
 	var jsonBlob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonBlob, &ptr)
 
+	//解密
+	//passWord := this.Decrypt(ptr.PassWord)
+
 	resp := rtxSvc.HandlePtrLogin(ptr.UserName, ptr.PassWord, BaseUserName)
 	log.Println("userName= ", ptr.UserName)
 	var datainfo DataInfo
@@ -84,6 +93,34 @@ func (this *RtxController) PtrLogin() {
 	this.ServeJSON()
 }
 
+//解密
+func (this *RtxController) Decrypt(passWord string) string{
+
+	code, _:= base64.StdEncoding.DecodeString(passWord)
+	//打开文件
+	file, err := os.Open("./controllers/rtx/rsa_1024.pem")
+	if err != nil {
+		panic(err)
+	}
+	defer file.Close()
+	//获取文件内容
+	info, _ := file.Stat()
+	buf := make([]byte, info.Size())
+	file.Read(buf)
+	//pem解码
+	block, _ := pem.Decode(buf)
+	//X509解码
+	privateKey, err := x509.ParsePKCS1PrivateKey(block.Bytes)
+	if err != nil {
+		panic(err)
+	}
+	plainText, _ := rsa.DecryptPKCS1v15(rand.Reader, privateKey, code)
+	if plainText == nil {
+		return ""
+	}
+	return string(plainText)
+}
+
 // @Title get
 // @Description get workflow by token
 // @Success 200 {object} historicTasks

src/dashoo.cn/frontend_web/package.json

@@ -41,7 +41,8 @@
     "vuedraggable": "^2.15.0",
     "vuex-class": "^0.2.0",
     "wangeditor": ">=3.0.0",
-    "xlsx": "^0.14.3"
+    "xlsx": "^0.14.3",
+    "jsencrypt": "^2.3.0"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",

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

@@ -258,7 +258,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="注册资本" prop="RegCapital">
-              <el-input type="number" v-model.number="formData.RegCapital" :min="1" :readonly="!canUpdateSupplier"
+              <el-input type="number" v-model="formData.RegCapital" :readonly="!canUpdateSupplier"
                         placeholder="请输入" style="width: 100%">
                 <template slot="append">万元</template>
               </el-input>
@@ -664,8 +664,7 @@
           } ],
 
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

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

@@ -428,8 +428,7 @@
             <el-form-item label="注册资本"
                           prop="RegCapital">
               <el-input type="number"
-                        v-model.number="formData.RegCapital"
-                        :min="1"
+                        v-model="formData.RegCapital"
                         :readonly="!canUpdateSupplier"
                         placeholder="请输入"
                         style="width: 100%">
@@ -1142,8 +1141,7 @@ export default {
           trigger: 'change'
         }],
         RegCapital: [
-          {required: true, validator: checkMoney, trigger: 'change'},
-          { type: 'number', message: '只能输入数字', trigger: 'blur' }
+          {required: true, validator: checkMoney, trigger: 'change'}
         ],
         DepositBank: [{
           required: true,

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

@@ -255,7 +255,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="注册资本" prop="RegCapital" >
-              <el-input type="number" :readonly="!canUpdateSupplier" v-model.number="formData.RegCapital" :min="1"  placeholder="请输入" style="width: 100%">
+              <el-input type="number" :readonly="!canUpdateSupplier" v-model="formData.RegCapital" placeholder="请输入" style="width: 100%">
                 <template slot="append">万元</template>
               </el-input>
             </el-form-item>
@@ -669,8 +669,7 @@
           //   trigger: 'change'
           // } ],
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

src/dashoo.cn/frontend_web/src/components/oilsupplierstore/basisinfo.vue

@@ -172,7 +172,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="注册资本" prop="RegCapital">
-            <el-input type="number" v-model.number="formData.RegCapital" :min="1" placeholder="请输入" style="width: 100%">
+            <el-input type="number" v-model="formData.RegCapital"  placeholder="请输入" style="width: 100%">
               <template slot="append">万元</template>
             </el-input>
           </el-form-item>
@@ -552,8 +552,7 @@
           } ],
 
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

src/dashoo.cn/frontend_web/src/components/oilsupplierstore/goodsinfo.vue

@@ -333,7 +333,7 @@
             <el-form-item label="注册资本"
                           prop="RegCapital">
               <el-input type="number"
-                        v-model.number="formData.RegCapital"
+                        v-model="formData.RegCapital"
                         :min="1"
                         placeholder="请输入"
                         style="width: 100%">
@@ -957,8 +957,7 @@
             trigger: 'change'
           }],
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

src/dashoo.cn/frontend_web/src/components/oilsupplierstore/techinfo.vue

@@ -194,7 +194,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="注册资本" prop="RegCapital" >
-            <el-input type="number" v-model.number="formData.RegCapital" :min="1"  placeholder="请输入" style="width: 100%">
+            <el-input type="number" v-model="formData.RegCapital"   placeholder="请输入" style="width: 100%">
               <template slot="append">万元</template>
             </el-input>
           </el-form-item>
@@ -600,8 +600,7 @@
           //   trigger: 'change'
           // } ],
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -137,6 +137,7 @@ import Iam from '@/api/iamlogin/iamlogin'
 import documentApi from '@/api/oilsupplier/document'
 import SIdentify from '@/components/VCode.vue'
 import Cookies from 'js-cookie'
+// import { JSEncrypt } from 'jsencrypt'
 // import {mapGetters} from 'vuex'
 @Component({
   data () {
@@ -393,7 +394,25 @@ import Cookies from 'js-cookie'
         })
       }
     },
+    //加密
+    // encrypt () {
+    //   // global.navigator = {
+    //   //   userAgent: 'node.js'
+    //   // }
+    //   let encryptor = new JSEncrypt()
+    //   console.log(encryptor, 'encrypt')
+    //   let publicKey = 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7mdUu2te/j/VEhNaDln5KddU4\n' +
+    //     'G7CeJyh86UVm7uX3MHxgyr2CzWQpfdLey8L6Kd5U8gcnvE5sheWc8IikOlOHrL8B\n' +
+    //     'KTww3Dxgv7miNQY9AEAi6GT+xbufXV1wZ1FD/JTtgEX/pXr5e+aPVCWZ03dk4gn2\n' +
+    //     'FMufT43DLNHxVUnjrQIDAQAB'
+    //   encryptor.setPublicKey(publicKey)
+    //   let password = encryptor.encrypt(this.model.password)
+    //   return password
+    // },
+
     loginptr () {
+      //加密
+      // let password = this.encrypt()
       let params = {
         username: this.model.username,
         password: this.model.password
@@ -441,6 +460,8 @@ export default class Login extends Vue {
       return false
     }
     this.loading = true
+    //加密
+    // let password = this.encrypt()
     this.$refs.user.validate(async valid => {
       try {
         if (valid) {
@@ -519,7 +540,7 @@ export default class Login extends Vue {
     from(rgba(75, 165, 241, 0.9)),
     to(rgba(55, 123, 188, 0.9))
   );
-  border-color: "";
+  border-color: #409eff;
 }
 .msgotification,
 .datadownload {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -198,7 +198,7 @@
 
                 <el-col :span="8">
                   <el-form-item label="注册资本" prop="RegCapital">
-                    <el-input type="number" v-model.number="supplierData.RegCapital" :min="1"
+                    <el-input type="number"  v-model="supplierData.RegCapital"
                               :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入"
                               style="width: 100%">
                       <template slot="append">万元</template>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -266,7 +266,7 @@
 
                 <el-col :span="8">
                   <el-form-item label="注册资本" prop="RegCapital">
-                    <el-input type="number" v-model.number="supplierData.RegCapital" :min="1"
+                    <el-input type="number"  v-model="supplierData.RegCapital"
                               :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入"
                               style="width: 100%">
                       <template slot="append">万元</template>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -199,7 +199,7 @@
 
                 <el-col :span="8">
                   <el-form-item label="注册资本" prop="RegCapital">
-                    <el-input type="number" v-model.number="supplierData.RegCapital" :min="1"
+                    <el-input type="number"  v-model="supplierData.RegCapital"
                               :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入"
                               style="width: 100%">
                       <template slot="append">万元</template>

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

@@ -327,7 +327,7 @@
                       <el-form-item label="注册资本"
                                     prop="RegCapital">
                         <el-input type="number" :class="changedForm['RegCapital'] ? 'modified-form-input' : ''"
-                                  v-model.number="formData.RegCapital"
+                                  v-model="formData.RegCapital"
                                   :min="1" :readonly="true"
                                   placeholder="请输入"
                                   style="width: 100%">
@@ -1510,8 +1510,7 @@ export default {
           }],
 
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

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

@@ -283,7 +283,7 @@
                 <el-row>
                   <el-col :span="8">
                     <el-form-item label="注册资本" prop="RegCapital">
-                      <el-input type="number" v-model.number="formData.RegCapital" :min="1"
+                      <el-input type="number" v-model="formData.RegCapital"
                         :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入"
                         style="width: 100%">
                         <template slot="append">万元</template>
@@ -1393,8 +1393,7 @@
           }],
 
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

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

@@ -285,7 +285,7 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="注册资本" prop="RegCapital">
-                  <el-input type="number" v-model.number="formData.RegCapital" :min="1"
+                  <el-input type="number" v-model="formData.RegCapital"
                     :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入"
                     style="width: 100%">
                     <template slot="append">万元</template>
@@ -1387,8 +1387,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
           }],
 
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

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

@@ -351,7 +351,7 @@
                       <el-form-item label="注册资本"
                                     prop="RegCapital">
                         <el-input type="number" :class="changedForm['RegCapital'] ? 'modified-form-input' : ''"
-                                  v-model.number="formData.RegCapital"
+                                  v-model="formData.RegCapital"
                                   :min="1"
                                   placeholder="请输入"
                                   style="width: 100%">
@@ -1660,8 +1660,7 @@
           //   trigger: 'change'
           // } ],
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

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

@@ -221,7 +221,7 @@
                   <el-col :span="8">
                     <el-form-item label="注册资本" prop="RegCapital" >
                       <el-input type="number" :class="changedForm['RegCapital'] ? 'modified-form-input' : ''"
-                                :readonly="!canUpdateSupplier" v-model.number="formData.RegCapital" :min="1"  placeholder="请输入" style="width: 100%">
+                                :readonly="!canUpdateSupplier" v-model="formData.RegCapital"   placeholder="请输入" style="width: 100%">
                         <template slot="append">万元</template>
                       </el-input>
                     </el-form-item>
@@ -1284,8 +1284,7 @@ import Viewer from 'v-viewer'
           }],
 
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

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

@@ -218,7 +218,7 @@
                   <el-col :span="8">
                     <el-form-item label="注册资本" prop="RegCapital" >
                       <el-input type="number" :class="changedForm['RegCapital'] ? 'modified-form-input' : ''"
-                                :readonly="!canUpdateSupplier" v-model.number="formData.RegCapital" :min="1"  placeholder="请输入" style="width: 100%">
+                                :readonly="!canUpdateSupplier" v-model="formData.RegCapital"   placeholder="请输入" style="width: 100%">
                         <template slot="append">万元</template>
                       </el-input>
                     </el-form-item>
@@ -1405,8 +1405,7 @@
           }],
 
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

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

@@ -241,7 +241,7 @@
 
               <el-col :span="8">
                 <el-form-item label="注册资本" prop="RegCapital">
-                  <el-input type="number" v-model.number="formData.RegCapital" :min="1" :readonly="InfoStatus > 0 || butnab"
+                  <el-input type="number" v-model="formData.RegCapital"  :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入"
                     style="width: 100%">
                     <template slot="append">万元</template>
@@ -1475,8 +1475,7 @@
           }],
 
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalog/income.vue

@@ -109,7 +109,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="注册资金" prop="RegCapital">
-              <el-input type="number" v-model.number="formData.RegCapital" :min="1" placeholder="注册资金" style="width: 100%">
+              <el-input type="number" v-model="formData.RegCapital"  placeholder="注册资金" style="width: 100%">
                 <template slot="append">万元</template>
               </el-input>
             </el-form-item>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogselect/income.vue

@@ -102,7 +102,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="注册资金" prop="RegCapital">
-              <el-input type="number" v-model.number="formData.RegCapital" :min="1" placeholder="" readonly style="width: 100%">
+              <el-input type="number" v-model="formData.RegCapital"  placeholder="" readonly style="width: 100%">
                 <template slot="append">万元</template>
               </el-input>
             </el-form-item>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogsub/_opera/incomeedit.vue

@@ -469,8 +469,7 @@
             { required: false, validator: checkCommercialNo, trigger: 'change' }
           ],
           RegCapital: [
-            { required: false, validator: checkMoney, trigger: 'change' },
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            { required: false, validator: checkMoney, trigger: 'change' }
           ],
           RecordScope: [
             { required: true, message: '业务范围不能为空', trigger: 'blur' }

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

@@ -205,7 +205,7 @@
 
                 <el-col :span="8">
                   <el-form-item label="注册资本" prop="RegCapital">
-                    <el-input type="number" v-model.number="supplierData.RegCapital" :min="1"
+                    <el-input type="number"  v-model="supplierData.RegCapital"
                               :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入"
                               style="width: 100%">
                       <template slot="append">万元</template>
@@ -1375,8 +1375,7 @@
           }],
 
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -263,7 +263,7 @@
 
                 <el-col :span="8">
                   <el-form-item label="注册资本" prop="RegCapital">
-                    <el-input type="number" v-model.number="supplierData.RegCapital" :min="1"
+                    <el-input type="number"  v-model="supplierData.RegCapital"
                               :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入"
                               style="width: 100%">
                       <template slot="append">万元</template>
@@ -1750,8 +1750,7 @@
           }],
 
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -205,7 +205,7 @@
 
                 <el-col :span="8">
                   <el-form-item label="注册资本" prop="RegCapital">
-                    <el-input type="number" v-model.number="supplierData.RegCapital" :min="1"
+                    <el-input type="number"  v-model="supplierData.RegCapital"
                               :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入"
                               style="width: 100%">
                       <template slot="append">万元</template>
@@ -1457,8 +1457,7 @@
           }],
 
           RegCapital: [
-            {required: true, validator: checkMoney, trigger: 'change'},
-            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+            {required: true, validator: checkMoney, trigger: 'change'}
           ],
           DepositBank: [{
             required: true,