xqing

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

@@ -121,22 +121,34 @@
             <span v-if="item.F_ToDept && item.F_ToDept != '0'"
               >送达科室：{{
                 $mHelper.findParents(departList, item.F_ToDept)
-              }}-</span
+              }}-{{item.F_DicName}}({{item.F_Number}})</span
             >
-            <span v-if="findIndex >= 0">{{
+            <span v-if="findIndex >= 0 && !item.F_IsBorrow && !item.F_ToDept">{{
               $mHelper.findParents(orderTypeBBXXList, item.F_DicId) +
               "（" +
               item.F_Number +
               "）"
             }}</span>
-            <span v-if="findIndex < 0">{{
-              item.F_DicName + "（" + item.F_Number + "）"
+			<span v-if="findIndex < 0 && !item.F_IsBorrow && !item.F_ToDept">{{
+			  item.F_DicName +
+			  "（" +
+			  item.F_Number +
+			  "）"
+			}}</span>
+            <span v-if="findIndex < 0 && item.F_IsBorrow == 1">{{
+              item.F_DicName + "（借" + item.F_Number + "）"
             }}</span>
-            <span v-if="item.F_IsBorrow == 1">(借)</span>
+			<span v-if="findIndex < 0 && item.F_IsBorrow == 2">{{
+			  item.F_DicName + "（还" + item.F_Number + "）"
+			}}</span>
+			<!-- <span v-if="findIndex < 0 && !item.F_IsBorrow">{{
+			  item.F_DicName + "（" + item.F_Number + "）"
+			}}</span> -->
+            <!-- <span v-if="item.F_IsBorrow == 1">(借)</span>
             <span v-if="item.F_IsBorrow == 2">(还)</span>
             <span v-if="item.F_PaidInQuantity"
               >(实收数量:{{ item.F_PaidInQuantity }})</span
-            >
+            > -->
             <span v-else></span>
           </div>
         </div>
@@ -157,22 +169,31 @@
             <span v-if="item.F_ToDept && item.F_ToDept != '0'"
               >送达科室：{{
                 $mHelper.findParents(departList, item.F_ToDept)
-              }}-</span
+              }}-{{item.F_DicName}}({{item.F_Number}})</span
             >
-            <span v-if="findIndex >= 0">{{
+            <span v-if="findIndex >= 0 && !item.F_IsBorrow && !item.F_ToDept">{{
               $mHelper.findParents(orderTypeBBXXList, item.F_DicId) +
               "（" +
               item.F_Number +
               "）"
             }}</span>
-            <span v-if="findIndex < 0">{{
-              (item.F_DicName || "") + "（" + item.F_Number + "）"
+			<span v-if="findIndex < 0 && !item.F_IsBorrow && !item.F_ToDept">{{
+			  item.F_DicName +
+			  "（" +
+			  item.F_Number +
+			  "）"
+			}}</span>
+            <span v-if="findIndex < 0 && item.F_IsBorrow == 1">{{
+              item.F_DicName + "（借" + item.F_Number + "）"
+            }}</span>
+            <span v-if="findIndex < 0 && item.F_IsBorrow == 2">{{
+              item.F_DicName + "（还" + item.F_Number + "）"
             }}</span>
-            <span v-if="item.F_IsBorrow == 1">(借)</span>
+            <!-- <span v-if="item.F_IsBorrow == 1">(借)</span>
             <span v-if="item.F_IsBorrow == 2">(还)</span>
             <span v-if="item.F_PaidInQuantity"
               >(实收数量:{{ item.F_PaidInQuantity }})</span
-            >
+            > -->
             <span v-else></span>
           </div>
         </div>
@@ -584,14 +605,14 @@ export default {
                 response.data && response.data.length > 0
                   ? response.data[0]
                   : {};
-              // console.log(this.detailContentData.F_WorkOrderCategory,'88999')
+              console.log(this.detailContentData.F_WorkOrderCategory,'88999')
               this.workOrdertype = this.detailContentData.F_WorkOrderCategory;
               this.applicationDept = this.detailContentData.F_ApplicationDept;
               const identification = this.$mHelper.findParents(
                 this.orderTypeList,
-                this.F_WorkOrderCategory
+                this.detailContentData.F_WorkOrderCategory
               );
-
+			  console.log(identification,'8899988888888')
               if (identification) {
                 this.findIndex = identification.indexOf("标本");
               }