xqing

CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

@@ -368,25 +368,29 @@
         </el-row>
         <el-row v-if="dealWorkForm.isabnormal === '1' && bbtags.indexOf('急查标本') >= 0">
           <el-row v-for="(item, index) in dispatchhaocaiarrError" :key="index">
-            <el-col :span="7">
+            <el-col :span="8">
               <el-form-item prop="devname">
                 <el-cascader ref="cascaderbb" :options="bborderData" :props="TagProps" clearable filterable
                   placeholder="请选择标本" @change="(devname) => handleChange(devname, index)"></el-cascader>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item prop="num">
                 <el-input-number v-model="item.F_Number" :min="0" size="medium" />
+                <el-button type="primary" icon="el-icon-close" circle @click="removeItem(index)" />
               </el-form-item>
             </el-col>
-            <el-col :span="11">
+            <!-- <el-col :span="11">
               <el-form-item prop="num">
                 <el-input style="width: 180px" v-model="item.F_ReceiveUser" placeholder="科室交接人"></el-input>
                 <el-button type="primary" icon="el-icon-close" circle @click="removeItem(index)" />
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
         </el-row>
+        <el-form-item label="科室交接人" v-if="dealWorkForm.isabnormal === '1' && bbtags.indexOf('急查标本') >= 0">
+          <el-input placeholder="科室交接人" v-model="dealWorkForm.recipient"></el-input>
+        </el-form-item>
         <el-form-item label="附件" v-if="bbtags.indexOf('急查标本') < 0">
           <el-upload :headers="headers" :on-remove="handle_remove" :on-success="handle_success"
             :file-list="dealWorkFormFile" :action="imgUrl" list-type="picture-card">
@@ -425,26 +429,30 @@
         </el-row>
         <el-row v-if="dealEditWorkForm.isabnormal === '1' && bbtags.indexOf('急查标本') >= 0">
           <el-row v-for="(item, index) in dispatchhaocaiarrEdit" :key="index">
-            <el-col :span="7">
+            <el-col :span="8">
               <el-form-item>
                 <el-cascader v-model="item.F_DicId" ref="cascaderbbedit" :options="bborderData" :props="TagProps"
                   clearable filterable placeholder="请选择标本" @change="(F_DicId) => handleChangeEdit(F_DicId, index)">
                 </el-cascader>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item prop="num">
                 <el-input-number v-model="item.F_Number" :min="0" size="medium" />
+                <el-button type="primary" icon="el-icon-close" circle @click="removeItemEdit(index)" />
               </el-form-item>
             </el-col>
-            <el-col :span="11">
+            <!-- <el-col :span="11">
               <el-form-item prop="num">
                 <el-input style="width: 180px" v-model="item.F_ReceiveUser" placeholder="科室交接人"></el-input>
                 <el-button type="primary" icon="el-icon-close" circle @click="removeItemEdit(index)" />
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
         </el-row>
+        <el-form-item label="科室接收人" v-if="dealEditWorkForm.isabnormal === '1' && bbtags.indexOf('急查标本') >= 0">
+          <el-input placeholder="科室接收人" v-model="dealEditWorkForm.recipient"></el-input>
+        </el-form-item>
         <el-form-item label="附件" v-if="bbtags.indexOf('急查标本') < 0">
           <el-upload :headers="headers" :on-remove="handle_removeEdit" :on-success="handle_successEdit"
             :file-list="dealEditWorkFormFile" :action="imgUrl" list-type="picture-card">
@@ -702,12 +710,12 @@
         dispatchhaocaiarrError: [{
           F_DicId: "",
           F_Number: 0,
-          F_ReceiveUser: "",
+          // F_ReceiveUser: "",
         }, ],
         dispatchhaocaiarrEdit: [{
           F_DicId: '',
           F_Number: 0,
-          F_ReceiveUser: "",
+          // F_ReceiveUser: "",
         }, ],
         reason1: "",
         reason2: "",
@@ -917,13 +925,13 @@
         dealWorkForm: {
           file: "",
           remark: "",
-          // recipient: "",
+          recipient:"",
           isabnormal: "0",
         },
         dealEditWorkForm: {
           file: "",
           remark: "",
-          // recipient: "",
+          recipient: "",
           isabnormal: "0",
         },
         collectForm: {
@@ -1030,7 +1038,7 @@
         const params = {
           F_DicId: "",
           F_Number: 0,
-          F_ReceiveUser: "",
+          // F_ReceiveUser: "",
         };
         this.dispatchhaocaiarrError.push(params);
       },
@@ -1038,7 +1046,7 @@
         const params = {
           F_DicId: "",
           F_Number: 0,
-          F_ReceiveUser: "",
+          // F_ReceiveUser: "",
         };
         this.dispatchhaocaiarrEdit.push(params);
       },
@@ -1157,7 +1165,7 @@
           type: 1
         };
         GetOrderDetail(params).then(res => {
-          if (res.data.length > 0 && res.data[0].F_OperationType == 9) {
+          if (res.data.length > 0 && res.data[0].F_OperationType == 9 && res.data[0].F_LogContent.length > 3) {
             this.dealEditWorkForm.remark = res.data[0].F_LogContent.slice(res.data[0].F_LogContent.indexOf(',') + 1,
               res.data[0].F_LogContent.length)
           }
@@ -1178,6 +1186,7 @@
           if (res.data[0].F_IsAbnormal) {
             this.dealEditWorkForm.isabnormal = res.data[0].F_IsAbnormal.toString()
           }
+          this.dealEditWorkForm.recipient = res.data[0].F_Recipient
           if (this.bbtags.indexOf('急查标本') >= 0) {
             for (var i = 0; i < res.data[0].PSInfo.length; i++) {
               res.data[0].PSInfo[i].F_DicName =
@@ -1192,7 +1201,7 @@
               F_DicId: res.data[0].SDInfo[i].F_DicId,
               F_DicName: res.data[0].SDInfo[i].F_DicName,
               F_Number: res.data[0].SDInfo[i].F_Number,
-              F_ReceiveUser: res.data[0].SDInfo[i].F_ReceiveUser
+              // F_ReceiveUser: res.data[0].SDInfo[i].F_ReceiveUser
             })
           }
           this.dispatchhaocaiarrEdit = sdarr
@@ -1665,12 +1674,9 @@
         // return;
         if (formName === "dealWorkForm") {
           if (this.dispatchhaocaiarrError.length > 0) {
-
-            //v-if="dealWorkForm.isabnormal === '1' && bbtags.indexOf('急查标本') >= 0"
-
             if (this.dealWorkForm.isabnormal === '1' && this.bbtags.indexOf('急查标本') >= 0) {
               const index = this.dispatchhaocaiarrError.findIndex((o) => {
-                return !o.F_ReceiveUser || !o.F_DicName || !o.F_Number;
+                return !o.F_DicId || !o.F_Number;
               });
               if (index >= 0) {
                 this.$message.error("请选择对应物资信息");
@@ -1682,11 +1688,9 @@
         }
         if (formName === "dealEditWorkForm") {
           if (this.dispatchhaocaiarrEdit.length > 0) {
-
-            if (this.dealWorkForm.isabnormal === '1' && this.bbtags.indexOf('急查标本') >= 0) {
-
+            if (this.dealEditWorkForm.isabnormal === '1' && this.bbtags.indexOf('急查标本') >= 0) {
               const index = this.dispatchhaocaiarrEdit.findIndex((o) => {
-                return !o.F_ReceiveUser || !o.F_DicName || !o.F_Number;
+                return !o.F_DicId || !o.F_Number;
               });
               if (index >= 0) {
                 this.$message.error("请选择对应物资信息");
@@ -1753,12 +1757,15 @@
             console.log(formName);
             if (formName === "dealWorkForm") {
               const psarr = [];
-              console.log(this.dispatchhaocaiarrError);
               this.dealWorkForm.pslist = this.dispatchhaocaiarrError;
               if (this.bbtags.indexOf("急查标本") < 0) {
                 this.dealWorkForm.pslist = [];
-                // this.dealWorkForm.recipient = "";
-                this.dealWorkForm.isabnormal = "0";
+                this.dealWorkForm.recipient = "";
+                this.dealWorkForm.isabnormal = "";
+              }
+              if(this.dealWorkForm.isabnormal == "0"){
+                this.dealWorkForm.pslist = [];
+                this.dealWorkForm.recipient = ""
               }
               if (this.dealWorkForm.file === "") {
                 // this.$message.error('请上传附件')
@@ -1769,14 +1776,18 @@
                   this.dealWorkForm.file.length - 1
                 );
               }
-              console.log(this.dealWorkForm);
             }
             if (formName === "dealEditWorkForm") {
               const psarr = [];
               this.dealEditWorkForm.pslist = this.dispatchhaocaiarrEdit;
               if (this.bbtags.indexOf("急查标本") < 0) {
                 this.dealEditWorkForm.pslist = [];
-                this.dealEditWorkForm.isabnormal = "0";
+                this.dealEditWorkForm.recipient = "";
+                this.dealEditWorkForm.isabnormal = "";
+              }
+              if(this.dealEditWorkForm.isabnormal == "0"){
+                this.dealEditWorkForm.pslist = [];
+                this.dealEditWorkForm.recipient = ""
               }
               if (this.dealEditWorkForm.file === "") {
                 // this.$message.error('请上传附件')
@@ -2003,12 +2014,14 @@
                       this.dealWorkForm.remark = "";
                       this.dealWorkFormFile = [];
                       this.dealWorkForm.isabnormal = "0";
+                      this.dealWorkForm.recipient = "";
                     }
                     if (this.optionName == "schEdit") {
                       this.dealEditWorkForm.file = "";
                       this.dealEditWorkForm.remark = "";
                       this.dealEditWorkFormFile = [];
                       this.dealEditWorkForm.isabnormal = "0";
+                      this.dealEditWorkForm.recipient = "";
                     }
                     if (this.optionName == "dispatch_shouqubiaoben") {
                       this.collectForm.file = "";

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

@@ -72,9 +72,9 @@
               </tr>
               <tr v-show="isDD.indexOf('DD') >= 0 || isDD === 'GLY'">
                 <th>接单时间:</th>
-                <td>{{ orderDetailData.F_AcceptTime || "-" }}</td>
+                <td colspan="2">{{ orderDetailData.F_AcceptTime || "-" }}</td>
                 <th>完成时间:</th>
-                <td colspan="3">{{ orderDetailData.F_Endtime || "-" }}</td>
+                <td colspan="2">{{ orderDetailData.F_Endtime || "-" }}</td>
               </tr>
               <tr v-if="
                   orderDetailData.PSInfo && orderDetailData.PSInfo.length > 0
@@ -99,7 +99,7 @@
                       v-if="index!=orderDetailData.PSInfo.length-1">,</span></span>
                 </td> -->
               </tr>
-              <tr v-for="(item, index) in orderDetailData.PSInfo" :key="index+0">
+              <tr v-for="(item, index) in orderDetailData.PSInfo" :key="index+2">
                 <th v-if="item.F_ToDept">送达科室:</th>
                 <th v-if="item.F_ToDept">
                   {{
@@ -133,7 +133,7 @@
                 ">
                 <th :rowspan="orderDetailData.SDInfo.length + 1">异常配送信息:</th>
               </tr>
-              <tr v-for="(item, index) in orderDetailData.SDInfo" :key="index+0">
+              <tr v-for="(item, index) in orderDetailData.SDInfo" :key="index+11">
                 <th v-if="item.F_ToDept">送达科室:</th>
                 <th v-if="item.F_ToDept">
                   {{
@@ -162,10 +162,14 @@
                 </td>
                 <th>-</th>
               </tr>
-              <tr v-if="orderDetailData.F_Recipient">
+              <tr v-if="orderDetailData.F_TypeName2.indexOf('标本')>=0 && orderDetailData.F_IsAbnormal != null">
                 <th>是否异常:</th>
-                <td colspan="5">
+                <td colspan="2">
                   {{ orderDetailData.F_IsAbnormal == 0 ? "否" : "是" }}
+                </td>
+                <th>科室交接人:</th>
+                <td colspan="2">
+                  {{ orderDetailData.F_Recipient || "-"}}
                 </td>
               </tr>
               <tr>

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

@@ -202,17 +202,17 @@
 					<text v-if="item.F_DicName">{{item.F_DicName + '（'+ item.F_Number + '）'}}</text>
 					<text v-else class="contentText"></text>
 				</view> -->
-      </view>
-      <view class="contentTable" v-if="detailContentData.F_Recipient">
-        <text class="contentTitle">接收人：</text>
-        <text class="contentText">{{ detailContentData.F_Recipient }}</text>
-      </view>
-      <view class="contentTable" v-if="detailContentData.F_Recipient">
+      </view>      
+      <view class="contentTable" v-if="detailContentData.F_IsAbnormal != null">
         <text class="contentTitle">是否异常：</text>
         <text class="contentText">{{
           detailContentData.F_IsAbnormal == 0 ? "否" : "是"
         }}</text>
       </view>
+	  <view class="contentTable" v-if="detailContentData.F_IsAbnormal != null">
+	    <text class="contentTitle">科室交接人：</text>
+	    <text class="contentText">{{ detailContentData.F_Recipient || "-"}}</text>
+	  </view>
       <!-- <view class="contentTable" v-if="detailContentData.F_WorkOrderCodes">
 				<text class="contentTitle">关联工单：</text>
 				<text class="contentText">{{ detailContentData.F_WorkOrderCodes }}</text>

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

@@ -45,12 +45,12 @@
             ></uni-icons>
           </view>
           <view style="width: 100%" v-for="(item, index) in dicList">
-            <view style="width: 60%; padding: 15px">
+            <!-- <view style="width: 60%; padding: 15px">
               <uni-easyinput
                 v-model="item.F_ReceiveUser"
                 placeholder="科室交接人"
               />
-            </view>
+            </view> -->
             <view style="display: flex">
               <view class="dicSelect" style="width: 60%; padding: 15px">
                 <uni-data-picker
@@ -67,6 +67,13 @@
             </view>
           </view>
         </view>
+		<uni-forms-item v-show="isabnormal === '1'" label="科室接收人" name="recipient">
+		  <uni-easyinput
+		    type="text"
+		    v-model="recipient"
+		    placeholder="科室接收人"
+		  />
+		</uni-forms-item>
         <uni-forms-item label="附件" name="" v-if="findIndex < 0">
           <view class="example-body">
             <upload
@@ -124,7 +131,7 @@ export default {
           F_DicId: 0,
           F_DicName: "",
           F_Number: 1,
-          F_ReceiveUser: "",
+          // F_ReceiveUser: "",
         },
       ],
       getFontSizeValue: "1rem",
@@ -257,6 +264,10 @@ export default {
         params.isabnormal = "";
         params.recipient = "";
       }
+	  if(this.isabnormal == "0"){
+		params.pslist = null;
+		params.recipient = "";
+	  }
       if (this.state == 1) {
         this.$mHelper.httpPost(
           "Scheduling/DealWorkOrder",