keshi

CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

@@ -79,8 +79,8 @@
               <tr v-if="
                   orderDetailData.PSInfo && orderDetailData.PSInfo.length > 0
                 ">
-                <th>配送信息:</th>
-                <td colspan="5">
+                <th :rowspan="orderDetailData.PSInfo.length + 1">配送信息:</th>
+                <!-- <td colspan="5">
                   <span style="display: inline-block;margin-right: 20px;"
                     v-for="(item, index) in orderDetailData.PSInfo" :key="index+0" v-if="item.F_ToDept">{{ $store.getters.deptmap[parseInt(item.F_ToDept)] &&
                     $store.getters.deptmap[parseInt(item.F_ToDept)].text}}-{{item.F_DicName}}({{item.F_Number}})<span
@@ -97,9 +97,9 @@
                     v-for="(item, index) in orderDetailData.PSInfo" :key="index+0"
                     v-if="!item.F_ToDept&&!item.F_IsBorrow">{{ item.F_DicName }}({{item.F_Number}})<span
                       v-if="index!=orderDetailData.PSInfo.length-1">,</span></span>
-                </td>
+                </td> -->
               </tr>
-              <!-- <tr v-for="(item, index) in orderDetailData.PSInfo" :key="index+0">
+              <tr v-for="(item, index) in orderDetailData.PSInfo" :key="index+0">
                 <th v-if="item.F_ToDept">送达科室:</th>
                 <th v-if="item.F_ToDept">
                   {{
@@ -110,72 +110,43 @@
                 <th v-if="item.F_ToDept">物品名称:</th>
                 <td v-if="item.F_ToDept">
                   <span>{{ item.F_DicName }}</span>
-                  <span v-if="item.F_IsBorrow == 1">(借</span>
-                  <span v-if="item.F_IsBorrow == 2">(还</span>
-                  <span v-if="item.F_IsBorrow">{{ item.F_Number }})</span>
-                  <span v-if="!item.F_IsBorrow">({{ item.F_Number }})</span>
+                  <span v-if="item.F_IsBorrow == 1">(借)</span>
+                  <span v-if="item.F_IsBorrow == 2">(还)</span>
+                  <span>({{item.F_Number}})</span>
                 </td>
                 <th v-if="!item.F_ToDept">物品名称:</th>
                 <td v-if="!item.F_ToDept">
                   <span>{{ item.F_DicName }}</span>
-                  <span v-if="item.F_IsBorrow == 1">(借</span>
-                  <span v-if="item.F_IsBorrow == 2">(还</span>
-                  <span v-if="item.F_IsBorrow">{{ item.F_Number }})</span>
-                  <span v-if="!item.F_IsBorrow">({{ item.F_Number }})</span>
-                </td> -->
               <!-- <th>-</th>
-                <td>-</td> -->
-              <!-- <th v-if="!item.F_ToDept">数量:</th>
+                  <span v-if="item.F_IsBorrow == 1">(借)</span>
+                  <span v-if="item.F_IsBorrow == 2">(还)</span>
+                </td>
+                <th v-if="!item.F_ToDept">数量:</th>
                 <td v-if="!item.F_ToDept">
                   {{ item.F_Number
                   }}
-                  <span v-if="item.F_PaidInQuantity != null"
-                    >(实收数量:{{ item.F_PaidInQuantity }})</span
-                  >
-                </td> -->
-              <!-- <th>-</th> -->
+                  <span v-if="item.F_PaidInQuantity != null">(实收数量:{{ item.F_PaidInQuantity }})</span>
+                </td>
+                <th>-</th>
               </tr>
               <tr v-if="
                   orderDetailData.SDInfo && orderDetailData.SDInfo.length > 0
                 ">
-                <!-- <th :rowspan="orderDetailData.SDInfo.length + 1">
-                  异常配送信息:
-                </th> -->
-                <th>
-                  异常配送信息:
-                </th>
-                <td colspan="5">
-                  <span style="display: inline-block;margin-right: 20px;"
-                    v-for="(item, index) in orderDetailData.SDInfo" :key="index+11" v-if="item.F_ToDept">{{ $store.getters.deptmap[parseInt(item.F_ToDept)] &&
-                    $store.getters.deptmap[parseInt(item.F_ToDept)].text}}-{{item.F_DicName}}({{item.F_Number}})<span
-                      v-if="index!=orderDetailData.SDInfo.length-1">,</span></span>
-                  <span style="display: inline-block;margin-right: 20px;"
-                    v-for="(item, index) in orderDetailData.SDInfo" :key="index+11"
-                    v-if="item.F_IsBorrow==1">{{ item.F_DicName }}(借{{item.F_Number}})<span
-                      v-if="index!=orderDetailData.SDInfo.length-1">,</span></span>
-                  <span style="display: inline-block;margin-right: 20px;"
-                    v-for="(item, index) in orderDetailData.SDInfo" :key="index+11"
-                    v-if="item.F_IsBorrow==2">{{ item.F_DicName }}(还{{item.F_Number}})<span
-                      v-if="index!=orderDetailData.SDInfo.length-1">,</span></span>
-                  <span style="display: inline-block;margin-right: 20px;"
-                    v-for="(item, index) in orderDetailData.SDInfo" :key="index+11"
-                    v-if="!item.F_ToDept&&!item.F_IsBorrow">{{ item.F_DicName }}({{item.F_Number}})<span
-                      v-if="index!=orderDetailData.SDInfo.length-1">,</span></span>
-                </td>
+                <th :rowspan="orderDetailData.SDInfo.length + 1">异常配送信息:</th>
               </tr>
-              <!-- <tr v-for="(item, index) in orderDetailData.SDInfo" :key="index+11">
+              <tr v-for="(item, index) in orderDetailData.SDInfo" :key="index+0">
                 <th v-if="item.F_ToDept">送达科室:</th>
                 <th v-if="item.F_ToDept">
                   {{
-                    $store.getters.deptmap[parseInt(item.F_ToDept)] &&
-                    $store.getters.deptmap[parseInt(item.F_ToDept)].text
-                  }}
+                      $store.getters.deptmap[parseInt(item.F_ToDept)] &&
+                      $store.getters.deptmap[parseInt(item.F_ToDept)].text
+                    }}
                 </th>
                 <th v-if="item.F_ToDept">物品名称:</th>
                 <td v-if="item.F_ToDept">
                   <span>{{ item.F_DicName }}</span>
                   <span v-if="item.F_IsBorrow == 1">(借)</span>
                   <span v-if="item.F_IsBorrow == 2">(还)</span>
-                  <span>({{ item.F_Number }})</span>
+                  <span>({{item.F_Number}})</span>
                 </td>
                 <th v-if="!item.F_ToDept">物品名称:</th>
                 <td v-if="!item.F_ToDept">
@@ -184,15 +155,13 @@
                   <span v-if="item.F_IsBorrow == 2">(还)</span>
                 </td>
                 <th v-if="!item.F_ToDept">数量:</th>
-
                 <td v-if="!item.F_ToDept">
                   {{ item.F_Number
-                  }}<span v-if="item.F_PaidInQuantity != null"
-                    >(实收数量:{{ item.F_PaidInQuantity }})</span
-                  >
+                    }}
+                  <span v-if="item.F_PaidInQuantity != null">(实收数量:{{ item.F_PaidInQuantity }}</span>
                 </td>
-                <th v-if="item.F_ReceiveUser">{{ item.F_ReceiveUser }}</th>
-              </tr> -->
+                <th>-</th>
+              </tr>
               <tr v-if="orderDetailData.F_Recipient">
                 <th>是否异常:</th>
                 <td colspan="5">

CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/applicantList/applicantList.vue

@@ -32,6 +32,7 @@
 								</view>
 								<view class="uni-note">工单内容：{{item.F_Content}}</view>
 								<view class="uni-note">申请时间：{{item.F_CreateTime}}</view>
+								<view class="uni-note">申请科室：{{$mHelper.findParents(departList, item.F_ApplicationDept)}}</view>
 								<view class="uni-note">科室位置：{{item.F_Location}}</view>
 							</view>
 							<view class="textState">{{ item.StateName}}</view>