bug修改

refined-manager-ui/admin/src/views/appointment/constraint/dialogshow.vue

@@ -4,7 +4,7 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
 
-        <Field :span="20" label="姓名" prop="personId" v-model="form.name" placeholder="请输入个人姓名"/>
+        <Field :span="20" label="姓名" prop="name" v-model="form.name" placeholder="请输入个人姓名"/>
         <Field :span="20" label="联系方式" prop="contact" v-model="form.contact" placeholder="请输入联系方式"/>
         <Field :span="20" label="证件类型" prop="idCardType" v-model="form.idCardType" type="radio" :enumData="dict.idCardType" placeholder="请输入证件类型"/>
         <Field :span="20" label="证件号码" prop="idCardNo" v-model="form.idCardNo" placeholder="请输入证件号码"/>
@@ -29,6 +29,24 @@ export default {
     dialogShow,
   },
   data() {
+    let validatorSheet = (rule, value, callback)=>{
+        let Reg = /^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/
+        let regt =  /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+        
+        if( Reg.test( value ) || regt.test( value )  ) {
+            callback()
+        } else {
+            callback(new Error('输入正确格式的身份证号'))
+        }
+    }
+    let phoneReg = (rule, value, callback) =>{
+        let regExp=/^(((\+86)|(\+86-))|((86)|(86\-))|((0086)|(0086\-)))?1[3|5|7|8]\d{9}$/;
+        if(regExp.test(value)){
+            callback()
+        }else{
+            callback(new Error('请输入正确格式的手机号码'))
+        }
+    }
     return {
       // 遮罩层
       loading: true,
@@ -43,7 +61,24 @@ export default {
         "personId",
       ],
       // 表单校验
-      rules: {}
+      rules: {
+        
+        idCardNo: [
+            {required: true,message: "请输入身份证号码", trigger: "blur" },
+            {max: 18,message: "最多只能录入18个字符",trigger: "blur",},
+            {validator: validatorSheet,trigger: "blur"}
+        ],
+        name: [
+            {required: true,message: "请输入姓名", trigger: "blur" },
+        ],
+        idCardType: [
+            {required: true,message: "请输入证件类型", trigger: "blur" },
+        ],
+        contact:[
+            {required: true,message: "请输入联系方式", trigger: "blur" },
+            {validator:phoneReg, trigger: "blur" },
+        ]
+      }
     };
   },
 
@@ -83,10 +118,10 @@ export default {
       this.open = true;
     },
 
-    beforeSubmit(data) {
-      data.name = this.dict['personId'][data.personId];
-      return data;
-    },
+    // beforeSubmit(data) {
+    //   // data.name = this.dict['personId'][data.personId];
+    //   return data;
+    // },
 
     afterSubmit(data) {
       this.open = false;

refined-manager-ui/admin/src/views/care/constraint/dialogshow.vue

@@ -5,7 +5,7 @@
             <el-row>
               <Field :span="20" label="姓名" prop="name" v-model="form.name" placeholder="请输入个人姓名"/>
               <Field :span="20" label="联系方式" prop="contact" v-model="form.contact" placeholder="请输入联系方式"/>
-              <Field :span="20" label="证件类型" prop="idCardType" v-model="form.idCardType" type="radio" :enumData="dict.idCardType" placeholder="请输入证件类型"/>
+              <!-- <Field :span="20" label="证件类型" prop="idCardType" v-model="form.idCardType" type="radio" :enumData="dict.idCardType" placeholder="请输入证件类型"/> -->
               <Field :span="20" label="证件号码" prop="idCard" v-model="form.idCard" placeholder="请输入证件号码"/>
             </el-row>
         </el-form>
@@ -57,7 +57,7 @@
                 toString:[
                     "createWay",
                     "track",
-                    "idCardType",
+                    // "idCardType",
                     "personId",
                 ],
                 // 表单校验
@@ -71,9 +71,9 @@
                     name: [
                         {required: true,message: "请输入姓名", trigger: "blur" },
                     ],
-                    idCardType: [
-                        {required: true,message: "请输入证件类型", trigger: "blur" },
-                    ],
+                    // idCardType: [
+                    //     {required: true,message: "请输入证件类型", trigger: "blur" },
+                    // ],
                     contact:[
                         {required: true,message: "请输入联系方式", trigger: "blur" },
                         {validator:phoneReg, trigger: "blur" },
@@ -131,7 +131,7 @@
             },
 
           beforeSubmit(data){
-            data.name=this.dict['personId'][data.personId]
+            // data.name=this.dict['personId'][data.personId]
             return data;
           },
 
@@ -149,7 +149,7 @@
                     name : "",
                     contact : "",
                     idCard : "",
-                    idCardType : "居民身份证",
+                    // idCardType : "居民身份证",
                     serviceFrequency : null,
                     trackingTime : null,
                     createWay : null,

refined-manager-ui/admin/src/views/care/constraint/list.vue

@@ -55,7 +55,20 @@ export default {
 
     handleTrack(row) {
      // this.$refs.trackDrawerShow.view(row);
-      this.$refs.trackdialogform.view(row);
+      // this.$refs.trackdialogform.view(row);
+      let _this = this
+      this.$get("/care/constraint/track", {
+          id: row.id,
+        })
+            .then((res) => {
+              if (res.code == 1) {
+                _this.$message.success("追踪成功！");
+                _this.getData();
+              }
+            })
+            .catch((error) => {
+              _this.$message.error(error.message);
+            });
     },
 
     cancelTrack(row) {
@@ -65,11 +78,8 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(function () {
-        //todo
-        _this.$post("/care/constraint/save", {
+        _this.$get("/care/constraint/track", {
           id: row.id,
-          serviceFrequency: 0,
-          track: 0,
         })
             .then((res) => {
               if (res.code == 1) {
@@ -80,6 +90,21 @@ export default {
             .catch((error) => {
               _this.$message.error(error.message);
             });
+        //todo
+        // _this.$post("/care/constraint/save", {
+        //   id: row.id,
+        //   serviceFrequency: 0,
+        //   track: 0,
+        // })
+        //     .then((res) => {
+        //       if (res.code == 1) {
+        //         _this.$message.success("取消追踪成功！");
+        //         _this.getData();
+        //       }
+        //     })
+        //     .catch((error) => {
+        //       _this.$message.error(error.message);
+        //     });
 
       }).then(response => {
 
@@ -132,22 +157,11 @@ export default {
             label: "操作",
             width: 320,
             formatter: row => {
-              return (
+              if(row.track){
+                              return (
                   <div>
                     <table-buttons noAdd noView row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
                     <span> </span>
-
-                    <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-open"
-                        onClick={() => {
-                          this.handleTrack(row);
-                        }}
-                    >
-                      跟踪反馈
-                    </el-button>
-                    <span> </span>
                     <el-button
                         size="mini"
                         type="text"
@@ -159,6 +173,25 @@ export default {
                       取消跟踪
                     </el-button>
                   </div>);
+              }else{
+                return (
+                    <div>
+                      <table-buttons noAdd noView row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
+                      <span> </span>
+
+                      <el-button
+                          size="mini"
+                          type="text"
+                          icon="el-icon-open"
+                          onClick={() => {
+                            this.handleTrack(row);
+                          }}
+                      >
+                        跟踪反馈
+                      </el-button>
+                    </div>);
+
+              }
             }
           }
         ]

refined-manager-ui/admin/src/views/person/dialogshow.vue

@@ -9,7 +9,17 @@
         <Field label="身份证号码" prop="idCard" v-model="form.idCard" placeholder="请输入身份证号码"/>
         <Field label="性别" prop="gender" v-model="form.gender" type="select" :enumData="dict.gender" placeholder="请选择性别"/>
         <Field label="手机号码" prop="phone" v-model="form.phone" placeholder="请输入手机号码"/>
-        <Field label="出生日期" prop="birthday" v-model="form.birthday" type="date" />
+        <Field label="出生日期" prop="birthday"  >
+          <!-- v-model="form.birthday" type="date" -->
+                  <el-date-picker
+                  v-model="birthday"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="请选择出生日期"
+                  @change="changeTime"
+                >
+                </el-date-picker>
+        </Field>
         <Field label="家庭住址" prop="address" v-model="form.address" type="textarea" placeholder="请输入家庭住址"/>
         <Field label="照片路径"><imageUpload v-model="form.photo" prePath="/file/preview"/></Field>
         <Field label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
@@ -40,6 +50,7 @@ export default {
   },
   data() {
     return {
+      birthday:'',
       // 遮罩层
       loading: true,
       // 弹出层标题
@@ -78,6 +89,11 @@ export default {
   },
 
   methods: {
+    changeTime(e){
+      console.log(e);
+      this.birthday = e
+      this.form.birthday = e + " 00:00:00"
+    },
     /** 编辑 */
     edit(row) {
       this.reset()

refined-manager-ui/admin/vue.config.js

@@ -17,7 +17,8 @@ module.exports = {
 		hot: true,//自动保存
 		proxy: {
 			'/refined': {
-				target: 'http://112.19.80.237:11080/',
+				// target: 'http://112.19.80.237:11080/',
+				target: 'http://192.168.0.98:11080/',
 				// target: 'http://127.0.0.1:21080',
 				changeOrigin: true,
 				secure: false,