用户关联晶奇工号

src/jsonrpc/services/user.m.js

@@ -24,7 +24,7 @@ var JsonRpcUtils_1 = require("../JsonRpcUtils");
 var CreateUserRequest = /** @class */ (function (_super) {
     __extends(CreateUserRequest, _super);
     function CreateUserRequest(_a) {
-        var code = _a.code, userName = _a.userName, phone = _a.phone, cardNo = _a.cardNo, realName = _a.realName, headImageToken = _a.headImageToken, organizationCode = _a.organizationCode, teamCode = _a.teamCode, roleCode = _a.roleCode, secretPassword = _a.secretPassword, rankName = _a.rankName, signature = _a.signature, ultrasoundCode = _a.ultrasoundCode, ecgCode = _a.ecgCode, token = _a.token;
+        var code = _a.code, userName = _a.userName, phone = _a.phone, cardNo = _a.cardNo, realName = _a.realName, headImageToken = _a.headImageToken, organizationCode = _a.organizationCode, teamCode = _a.teamCode, roleCode = _a.roleCode, secretPassword = _a.secretPassword, rankName = _a.rankName, signature = _a.signature, ultrasoundCode = _a.ultrasoundCode, ecgCode = _a.ecgCode, facturyUserCode = _a.facturyUserCode, token = _a.token;
         var _this = _super.call(this, {
             token: token,
         }) || this;
@@ -42,6 +42,7 @@ var CreateUserRequest = /** @class */ (function (_super) {
         _this.signature = signature;
         _this.ultrasoundCode = ultrasoundCode;
         _this.ecgCode = ecgCode;
+        _this.facturyUserCode = facturyUserCode;
         _this.token = token;
         return _this;
     }
@@ -60,6 +61,7 @@ var CreateUserRequest = /** @class */ (function (_super) {
             signature: map['Signature'],
             ultrasoundCode: map['UltrasoundCode'],
             ecgCode: map['EcgCode'],
+            facturyUserCode: map['FacturyUserCode'],
             token: map['Token'],
         });
     };
@@ -93,6 +95,8 @@ var CreateUserRequest = /** @class */ (function (_super) {
             map['UltrasoundCode'] = this.ultrasoundCode;
         if (this.ecgCode != null)
             map['EcgCode'] = this.ecgCode;
+        if (this.facturyUserCode != null)
+            map['FacturyUserCode'] = this.facturyUserCode;
         return map;
     };
     return CreateUserRequest;
@@ -389,7 +393,7 @@ exports.GetUserListRequest = GetUserListRequest;
 var UpdateUserRequest = /** @class */ (function (_super) {
     __extends(UpdateUserRequest, _super);
     function UpdateUserRequest(_a) {
-        var code = _a.code, phone = _a.phone, cardNo = _a.cardNo, realName = _a.realName, headImageToken = _a.headImageToken, organizationCode = _a.organizationCode, teamCode = _a.teamCode, roleCode = _a.roleCode, rankName = _a.rankName, signature = _a.signature, ultrasoundCode = _a.ultrasoundCode, ecgCode = _a.ecgCode, token = _a.token;
+        var code = _a.code, phone = _a.phone, cardNo = _a.cardNo, realName = _a.realName, headImageToken = _a.headImageToken, organizationCode = _a.organizationCode, teamCode = _a.teamCode, roleCode = _a.roleCode, rankName = _a.rankName, signature = _a.signature, ultrasoundCode = _a.ultrasoundCode, ecgCode = _a.ecgCode, facturyUserCode = _a.facturyUserCode, token = _a.token;
         var _this = _super.call(this, {
             token: token,
         }) || this;
@@ -405,6 +409,7 @@ var UpdateUserRequest = /** @class */ (function (_super) {
         _this.signature = signature;
         _this.ultrasoundCode = ultrasoundCode;
         _this.ecgCode = ecgCode;
+        _this.facturyUserCode = facturyUserCode;
         _this.token = token;
         return _this;
     }
@@ -421,6 +426,7 @@ var UpdateUserRequest = /** @class */ (function (_super) {
             signature: map['Signature'],
             ultrasoundCode: map['UltrasoundCode'],
             ecgCode: map['EcgCode'],
+            facturyUserCode: map['FacturyUserCode'],
             token: map['Token'],
         });
     };
@@ -450,6 +456,8 @@ var UpdateUserRequest = /** @class */ (function (_super) {
             map['UltrasoundCode'] = this.ultrasoundCode;
         if (this.ecgCode != null)
             map['EcgCode'] = this.ecgCode;
+        if (this.facturyUserCode != null)
+            map['FacturyUserCode'] = this.facturyUserCode;
         return map;
     };
     return UpdateUserRequest;

src/jsonrpc/services/user.m.ts

@@ -21,6 +21,7 @@ export class CreateUserRequest extends TokenRequest {
 	signature: String;
 	ultrasoundCode: String;
 	ecgCode: String;
+	facturyUserCode: String;
 
 	constructor({
 		code,
@@ -37,6 +38,7 @@ export class CreateUserRequest extends TokenRequest {
 		signature,
 		ultrasoundCode,
 		ecgCode,
+		facturyUserCode,
 		token,
 	}) {
 		super({
@@ -56,6 +58,7 @@ export class CreateUserRequest extends TokenRequest {
 		this.signature = signature;
 		this.ultrasoundCode = ultrasoundCode;
 		this.ecgCode = ecgCode;
+		this.facturyUserCode = facturyUserCode;
 		this.token = token;
 	}
 
@@ -75,6 +78,7 @@ export class CreateUserRequest extends TokenRequest {
 			signature: map['Signature'],
 			ultrasoundCode: map['UltrasoundCode'],
 			ecgCode: map['EcgCode'],
+			facturyUserCode: map['FacturyUserCode'],
 			token: map['Token'],
 }		);
 	}
@@ -109,6 +113,8 @@ export class CreateUserRequest extends TokenRequest {
 			map['UltrasoundCode'] = this.ultrasoundCode;
 		if(this.ecgCode != null)
 			map['EcgCode'] = this.ecgCode;
+		if(this.facturyUserCode != null)
+			map['FacturyUserCode'] = this.facturyUserCode;
 		return map;
 	}
 }
@@ -507,6 +513,7 @@ export class UpdateUserRequest extends TokenRequest {
 	signature: String;
 	ultrasoundCode: String;
 	ecgCode: String;
+	facturyUserCode: String;
 
 	constructor({
 		code,
@@ -521,6 +528,7 @@ export class UpdateUserRequest extends TokenRequest {
 		signature,
 		ultrasoundCode,
 		ecgCode,
+		facturyUserCode,
 		token,
 	}) {
 		super({
@@ -538,6 +546,7 @@ export class UpdateUserRequest extends TokenRequest {
 		this.signature = signature;
 		this.ultrasoundCode = ultrasoundCode;
 		this.ecgCode = ecgCode;
+		this.facturyUserCode = facturyUserCode;
 		this.token = token;
 	}
 
@@ -555,6 +564,7 @@ export class UpdateUserRequest extends TokenRequest {
 			signature: map['Signature'],
 			ultrasoundCode: map['UltrasoundCode'],
 			ecgCode: map['EcgCode'],
+			facturyUserCode: map['FacturyUserCode'],
 			token: map['Token'],
 }		);
 	}
@@ -585,6 +595,8 @@ export class UpdateUserRequest extends TokenRequest {
 			map['UltrasoundCode'] = this.ultrasoundCode;
 		if(this.ecgCode != null)
 			map['EcgCode'] = this.ecgCode;
+		if(this.facturyUserCode != null)
+			map['FacturyUserCode'] = this.facturyUserCode;
 		return map;
 	}
 }

src/views/user/components/userFrom.vue

@@ -123,6 +123,17 @@
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col :span="11">
+        <el-form-item label="晶奇工号">
+          <el-cascader
+            v-model="formInline.facturyUserCode"
+            :options="facturyOrgs"
+            :show-all-levels="false"
+            :props="{ value: 'key', label: 'value' }"
+            clearable
+          ></el-cascader>
+        </el-form-item>
+      </el-col>
       <!-- <el-col :span="11" v-if="formInline.isCreating">
         <el-form-item label="头像">
           <el-upload
@@ -163,6 +174,7 @@ export default {
   data() {
     return {
       imageUrl: "",
+      facturyOrgs: [],
     };
   },
   methods: {
@@ -170,7 +182,7 @@ export default {
       console.log("选项发生变化，选中的值为:", value);
       // 在这里可以进行进一步的处理逻辑
       // debugger;
-	  this.formInline.teamCode = "";
+      this.formInline.teamCode = "";
       await this.getTeamPageAsync(value);
     },
     async teamSelectChange(value) {
@@ -199,33 +211,41 @@ export default {
     beforeAvatarUpload(file) {
       // 处理上传前的逻辑
     },
+    async getFacturyOrgs() {
+      var res = await this.$rpc.facturyUser.getFacturyTreeAsync({
+        Token: store.state.userInfo.token,
+      });
+      this.facturyOrgs = res || [];
+      console.log("getFacturyOrgs", res);
+    },
   },
   async mounted() {
-	await this.getTeamPageAsync(this.formInline.organizationCode);
-	if(this.formInline.roleCode && this.formInline.roles)
-	{
-		var isHadRole = this.formInline.roles.some(item => item.code == this.formInline.roleCode);
-		if(!isHadRole)
-		{
-			this.formInline.roleCode = "";
-		}
-	}
-	if(this.formInline.organizationCode && this.formInline.orgList)
-	{
-		var isHadOrg = this.formInline.orgList.some(item => item.code == this.formInline.organizationCode);
-		if(!isHadOrg)
-		{
-			this.formInline.organizationCode = "";
-		}
-	}
-	if(this.formInline.teamCode && this.formInline.teamList)
-	{
-		var isHadTeam = this.formInline.teamList.some(item => item.code == this.formInline.teamCode);
-		if(!isHadTeam)
-		{
-			this.formInline.teamCode = "";
-		}
-	}
+    await this.getTeamPageAsync(this.formInline.organizationCode);
+    if (this.formInline.roleCode && this.formInline.roles) {
+      var isHadRole = this.formInline.roles.some(
+        (item) => item.code == this.formInline.roleCode
+      );
+      if (!isHadRole) {
+        this.formInline.roleCode = "";
+      }
+    }
+    if (this.formInline.organizationCode && this.formInline.orgList) {
+      var isHadOrg = this.formInline.orgList.some(
+        (item) => item.code == this.formInline.organizationCode
+      );
+      if (!isHadOrg) {
+        this.formInline.organizationCode = "";
+      }
+    }
+    if (this.formInline.teamCode && this.formInline.teamList) {
+      var isHadTeam = this.formInline.teamList.some(
+        (item) => item.code == this.formInline.teamCode
+      );
+      if (!isHadTeam) {
+        this.formInline.teamCode = "";
+      }
+    }
+    await this.getFacturyOrgs();
   },
 };
 </script>

src/views/user/index.vue

@@ -332,7 +332,10 @@
       </template>
     </el-dialog>
 
-    <select-device-list ref="selectDeviceDialog" @success="search"></select-device-list>
+    <select-device-list
+      ref="selectDeviceDialog"
+      @success="search"
+    ></select-device-list>
   </div>
 </template>
 <script>
@@ -426,6 +429,7 @@ export default {
       this.formInline.password = "";
       this.formInline.teamList = [];
       this.formInline.confirmPassword = "";
+      this.formInline.facturyUserCode = "";
       this.formInline.isCreating = true;
       this.saveDialogVisible = true;
     },
@@ -445,6 +449,7 @@ export default {
       this.formInline.teamCode = result.teamCode;
       this.formInline.teamName = result.teamName;
       this.formInline.headImageToken = result.headImageToken;
+      this.formInline.facturyUserCode = result.facturyUserCode;
       this.mode = "edit";
       this.formInline.isCreating = false;
       this.saveDialogVisible = true;
@@ -493,6 +498,13 @@ export default {
     },
     async createOrUpdateUser() {
       debugger;
+      var facturyUserCode = "";
+      if (
+        this.formInline.facturyUserCode &&
+        this.formInline.facturyUserCode.length == 2
+      ) {
+        facturyUserCode = this.formInline.facturyUserCode[1];
+      }
       //创建或修改用户
       if (
         !this.formInline.userName ||
@@ -528,6 +540,7 @@ export default {
           organizationCode: this.formInline.organizationCode,
           teamCode: this.formInline.teamCode,
           roleCode: this.formInline.roleCode,
+          facturyUserCode: facturyUserCode,
           secretPassword: common.encrypt(this.formInline.password),
           token: store.state.userInfo.token,
         }).toJson();
@@ -546,9 +559,13 @@ export default {
           organizationCode: this.formInline.organizationCode,
           teamCode: this.formInline.teamCode,
           roleCode: this.formInline.roleCode,
+          facturyUserCode: facturyUserCode,
           token: store.state.userInfo.token,
         }).toJson();
         var result = await this.$rpc.user.updateUserAsync(request);
+        if (result) {
+          this.$message.success("更新成功");
+        }
       }
       this.saveDialogVisible = false;
       this.getUserList();