xiugai

CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

@@ -183,13 +183,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="typeAlias !== '2006'">
+        <!-- <el-row v-if="typeAlias !== '2006'">
           <el-col :span="24">
             <el-form-item label="送达地点" prop="toplace">
               <el-input v-model="ruleForm.toplace" type="text" placeholder="请输入送达地点" />
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
           <el-col :span="24">
             <el-form-item label="工单内容" prop="content">
@@ -385,16 +385,16 @@
             message: '科室位置不能为空',
             trigger: 'blur'
           }],
-          toplace: [{
-            required: true,
-            message: '送达地点不能为空',
-            trigger: 'blur'
-          }],
-          content: [{
-            required: true,
-            message: '工单内容不能为空',
-            trigger: 'blur'
-          }],
+          // toplace: [{
+          //   required: true,
+          //   message: '送达地点不能为空',
+          //   trigger: 'blur'
+          // }],
+          // content: [{
+          //   required: true,
+          //   message: '工单内容不能为空',
+          //   trigger: 'blur'
+          // }],
           phone: [{
               required: true,
               message: '手机号不能为空',

CallCenterWeb.UI/RMYY/src/components/workOrder/information/addOrEditInfOrder.vue

@@ -293,11 +293,11 @@
             message: '请选择工单类别',
             trigger: 'blur'
           }],
-          F_Customer: [{
-            required: true,
-            message: '姓名不能为空',
-            trigger: 'blur'
-          }],
+          // F_Customer: [{
+          //   required: true,
+          //   message: '姓名不能为空',
+          //   trigger: 'blur'
+          // }],
           F_Phon: [{
               required: true,
               message: '手机号不能为空',
@@ -321,11 +321,11 @@
           //     trigger: 'blur'
           //   }
           // ],
-          F_WorkOrderContents: [{
-            required: true,
-            message: '请输入工单内容',
-            trigger: 'blur'
-          }],
+          // F_WorkOrderContents: [{
+          //   required: true,
+          //   message: '请输入工单内容',
+          //   trigger: 'blur'
+          // }],
           F_FirstCheckHospital: [{
             required: true,
             message: '请输入首次检查医院',

CallCenterWeb.UI/RMYY/src/components/workOrder/vehicleDispatch/addOrEdit.vue

@@ -230,11 +230,11 @@
             message: '请输入',
             trigger: 'blur'
           }],
-          content: [{
-            required: true,
-            message: '请输入',
-            trigger: 'blur'
-          }]
+          // content: [{
+          //   required: true,
+          //   message: '请输入',
+          //   trigger: 'blur'
+          // }]
         },
         ruleForm: {
           F_ID: '',

CallCenterWeb.UI/RMYY/src/views/callScreen/components/addressNumber.vue

@@ -84,7 +84,6 @@
         this.watchTelLineState(newT, oldT);
       },
       $route(to,from){
-        // console.log(to,from)
         if(from.name == 'ADDORDER'){
           this.isywzx = true
         }
@@ -93,10 +92,12 @@
     created() {
       this.$bus.$on('typeSecondId', (params) => {
         if (params != 0) {
-          if(params != 1000){
+          var arr = this.$store.getters.workTypeMap[parseInt(params)].ids
+          // console.log(arr)
+          if(arr[0] != 1000){
              this.isywzx = false
           }
-          if(params == 1000){
+          if(arr[0] == 1000){
              this.isywzx = true
           }
         }

CallCenterWeb.UI/RMYY/src/views/login/index.vue

@@ -4,9 +4,9 @@
       <div class="signin_content" />
     </div>
     <div class="signin_right">
-      <p class="loginp">郑州人民医院综合服务保障调度平台</p>
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
         label-position="left">
+        <p class="loginp">郑州人民医院综合保障服务中心</p>
         <el-select v-model="userRole" placeholder="请选择您的角色" @change="toggle">
           <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
@@ -408,10 +408,10 @@
     }
 
     .loginp {
-      font-size: 25px;
+      font-size: 24px;
       position: absolute;
-      top: 17%;
-      right: 7%;
+      top: -25%;
+      right: 2%;
     }
 
     .signin_right {