1

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

@@ -193,10 +193,9 @@
               class="inputNumber" />
           </el-form-item>
         </el-col>
-        <el-row>
+        <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-select v-model="ruleForm.toplace" filterable placeholder="请选择送达地点" style="width: 100%;">
                 <el-option v-for="(item,index) in placeArr" :key="index" :label="item.F_Name" :value="item.F_Name">
                 </el-option>
@@ -204,6 +203,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <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-col :span="24">
             <el-form-item label="工单内容" prop="content">
@@ -222,7 +228,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="10">
             <el-form-item label="紧急情况">
               <el-radio-group v-model="ruleForm.EmergencyTypes">
                 <el-radio label="一般">一般</el-radio>
@@ -230,7 +236,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col v-if="iswomanage!=1 && iswomanage!=2" :span="12">
+          <el-col v-if="iswomanage!=1 && iswomanage!=2" :span="14">
             <el-form-item label="处理方式" prop="opt">
               <el-radio-group v-model="ruleForm.opt">
                 <el-radio label="0">立即办理</el-radio>

CallCenterWeb.UI/RMYY/src/views/layout/components/Navbar/orderMessage.vue

@@ -4,8 +4,9 @@
       <ul v-if="topNoticeData" class="content">
         <li class="proitem">
           <h5 class="proname">标题：{{ topNoticeData.SMS_Title }}</h5>
-          <span class="orderendtime" :title="topNoticeData.SMS_Content">内容：{{ topNoticeData.SMS_Content }}
-          </span>
+          <p class="orderendtime" :title="topNoticeData.SMS_Content" v-if="topNoticeData.SMS_Content">
+            内容：<span v-html="topNoticeData.SMS_Content.replaceAll('\n','<br>')"></span>
+          </p>
 
           <el-button class="unread" v-if="buttonFlag" @click="
               handleChange(