2.8.1

CallCenterWeb.UI/RMYY/src/api/comDispatch/addOrEditDispatch.js

@@ -100,8 +100,8 @@ export function postDispatchReBack(params) {
 export function postDispatchDealWorkOrder(params) {
   return request({
     url: 'Scheduling/DealWorkOrder',
-    method: 'get',
-    params
+    method: 'post',
+    data: params
   })
 }
 // 收取标本

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

@@ -328,8 +328,26 @@
     </el-dialog>
     <!-- 综合调度送达 -->
     <el-dialog :visible.sync="dialogStatus.dialog_dispatch_daoda" title="送达">
+      <el-table :data="dispatchhaocaiarr" border stripe v-if="bbtags.indexOf('急查标本')>=0">
+        <el-table-column prop="F_DicName" label="物品" align="center" />
+        <el-table-column prop="F_Number" label="数量" align="center" />
+        <el-table-column prop="" label="实收数量" align="center" >
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.F_PaidInQuantity" placeholder="请输入数量"></el-input>
+          </template>
+        </el-table-column>
+      </el-table>
       <el-form ref="dealWorkForm" :model="dealWorkForm" :rules="rules" label-width="100px">
-        <el-form-item label="附件">
+        <el-form-item label="接收人" v-if="bbtags.indexOf('急查标本')>=0">
+          <el-input v-model="dealWorkForm.recipient" placeholder="请输入接收人工号"></el-input>
+        </el-form-item>
+        <el-form-item label="是否异常" v-if="bbtags.indexOf('急查标本')>=0">
+          <el-radio-group v-model="dealWorkForm.isabnormal">
+            <el-radio label="0">否</el-radio>
+            <el-radio label="1">是</el-radio>
+          </el-radio-group>
+        </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">
             <i class="el-icon-plus" />
@@ -528,6 +546,8 @@
         fid: '',
         rowdata: {},
         haocaiarr: [],
+        bbtags:'',
+        dispatchhaocaiarr:[],
         reason1: '',
         reason2: '',
         reason3: '',
@@ -727,7 +747,9 @@
         },
         dealWorkForm: {
           file: '',
-          remark: ''
+          remark: '',
+          recipient:'',
+          isabnormal:'0'
         },
         collectForm: {
           jcnum:'0',
@@ -859,14 +881,27 @@
           // this.PictureUrl = res.data[0].PictureUrl
         })
       },
+      getDispatchHaocai(){
+        const params = {
+          WorkOrderCode: this.wocode,
+          type: 0
+        }
+        GetOrderDetail(params).then(res => {
+          this.bbtags = this.$store.getters.workTypeMap[parseInt(res.data[0].F_WorkOrderCategory)].text
+          // console.log(this.bbtags)
+          this.dispatchhaocaiarr = res.data[0].PSInfo
+          for (var i = 0; i < res.data[0].PSInfo.length; i++) {
+            res.data[0].PSInfo[i].F_DicName = this.$store.getters.bbxxTypeMap[parseInt(res.data[0].PSInfo[i].F_DicId)].text;
+          }
+          // console.log(res.data[0].PSInfo)
+        })
+      },
       getFileUrl() {
         const params = {
           WorkOrderCode: this.wocode,
           type: 0
         }
         GetFaultRepairDetail(params).then(res => {
-          // this.haocaiarr = res.data[0].Equips
-          //this.FileUrl = res.data[0].FileUrl
           this.PictureUrl = res.data[0].PictureUrl
         })
       },
@@ -1049,6 +1084,9 @@
           this.getHaocai()
           this.getFileUrl()
         }
+        if(name === 'dispatch_daoda'){
+          this.getDispatchHaocai()
+        }
         if (name === 'fanxiu') {
           this.getReason('FXYY')
         }
@@ -1272,6 +1310,19 @@
           if (valid) {
             console.log(formName)
             if (formName === 'dealWorkForm') {
+              const psarr = []
+              this.dispatchhaocaiarr.forEach(function(v,n){
+                psarr.push({
+                  F_DetailId: v.F_DetailId,
+                  F_PaidInQuantity:v.F_PaidInQuantity
+                })
+              })
+              this.dealWorkForm.pslist = psarr
+              if(this.bbtags.indexOf('急查标本')<0){
+                this.dealWorkForm.pslist = []
+                this.dealWorkForm.recipient = ''
+                this.dealWorkForm.isabnormal =''
+              }
               if (this.dealWorkForm.file === '') {
                 // this.$message.error('请上传附件')
                 // return

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

@@ -84,9 +84,17 @@
                   <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 }}</td>
+                <td v-if="!item.F_ToDept">{{ item.F_Number }}<span v-if="item.F_PaidInQuantity">(实收数量:{{item.F_PaidInQuantity}})</span></td>
                 <th>-</th>
               </tr>
+              <tr v-if="orderDetailData.F_Recipient">
+                <th>接收人:</th>
+                <td colspan="5">{{ orderDetailData.F_Recipient}}</td>
+              </tr>
+              <tr v-if="orderDetailData.F_Recipient">
+                <th>是否异常:</th>
+                <td colspan="5">{{ orderDetailData.F_IsAbnormal == 0 ? "否" : "是" }}</td>
+              </tr>
               <!-- <tr v-if="orderDetailData.F_WorkOrderCodes">
                 <th>关联工单:</th>
                 <td colspan="5">

CallCenterWeb.UI/RMYY/src/views/equipmentManage/equipmentList/index.vue

@@ -25,7 +25,7 @@
           <span v-if="scope.row.F_State==0">无效</span>
         </template>
       </el-table-column>
-      <el-table-column prop="F_ApplicableDept" :formatter="formatterDept" label="适用科室" align="center" min-width />
+      <el-table-column prop="F_ApplicableDept" :show-overflow-tooltip="true" :formatter="formatterDept" label="适用科室" align="center" min-width />
       <el-table-column prop="F_CreateName" label="添加人" align="center" min-width />
       <el-table-column prop="F_CreateTime" label="添加时间" align="center" min-width />
       <el-table-column label="操作" align="center">
@@ -97,7 +97,7 @@
             if (arr[i] == window.localStorage.getItem('deptId')) {
               depttext += this.$store.getters.workdeptments[0].text + ','
             } else {
-              depttext += this.$store.getters.workdeptmap[parseInt(arr[i])].text + ','
+              depttext += this.$store.getters.deptmap[parseInt(arr[i])].text + ','
             }
           }
         }

CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/index.vue

@@ -315,7 +315,50 @@
       class="pagination"
       @pagination="getListTask"
     />
-
+    <el-dialog :visible.sync="dialogZuzhang" title="转组长">
+      <el-form ref="zuzhangForm" :rules="rules" label-width="100px">
+        <el-form-item label="原因">
+          <el-select
+            v-model="zuzhangForm.reason"
+            clearable
+            placeholder="请选择原因"
+          >
+            <el-option
+              v-for="item in reasonarr1"
+              :key="item.F_DictionaryValueId"
+              :label="item.F_Name"
+              :value="item.F_Name"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogZuzhang = false">取 消</el-button>
+        <el-button type="primary" @click="dialogTransferZuzhang">确 定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="dialogZhiban" title="转值班">
+      <el-form ref="zhibanForm" :rules="rules" label-width="100px">
+        <el-form-item label="原因">
+          <el-select
+            v-model="zhibanForm.reason"
+            clearable
+            placeholder="请选择原因"
+          >
+            <el-option
+              v-for="item in reasonarr1"
+              :key="item.F_DictionaryValueId"
+              :label="item.F_Name"
+              :value="item.F_Name"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogZhiban = false">取 消</el-button>
+        <el-button type="primary" @click="dialogTransferZhiban">确 定</el-button>
+      </div>
+    </el-dialog>
     <el-dialog :visible.sync="dialogHangUp" title="挂起">
       <el-form ref="hangupForm" :rules="rules" label-width="100px">
         <el-form-item label="原因">
@@ -789,7 +832,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="doneForm.type == '0'" label="是否涉及耗材">
+        <el-form-item label="是否涉及耗材">
           <el-radio-group
             v-model="doneForm.IsInvolvedEquip"
             style="margin-right: 15px"
@@ -798,25 +841,6 @@
             <el-radio label="0">否</el-radio>
             <el-radio label="1">是</el-radio>
           </el-radio-group>
-          <!-- <el-select
-            v-if="doneForm.IsInvolvedEquip == '1'"
-            filterable
-            v-model="equilist"
-            placeholder="请选择耗材"
-            size="medium"
-            multiple
-            collapse-tags
-            clearable
-            style="width: 80%"
-            @change="equiChange"
-          >
-            <el-option
-              v-for="(item, index) in equiArr"
-              :key="index"
-              :label="item.F_EquipName + '(' + item.F_EquipNumber + ')'"
-              :value="item.F_EquipID"
-            />
-          </el-select> -->
         </el-form-item>
         <el-form-item v-if="doneForm.IsInvolvedEquip == '1'" label="耗材信息">
           <el-select
@@ -838,7 +862,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="doneForm.type == '0' && equilist.length > 0">
+        <el-form-item v-if="equilist.length > 0">
           <el-table :data="equipmodellist" border stripe style="width: 100%">
             <el-table-column prop="F_EquipName" label="耗材名称" />
             <el-table-column prop="F_EquipNumber" label="规格型号" />
@@ -966,6 +990,16 @@ export default {
   },
   data() {
     return {
+      dialogZuzhang:false,
+      dialogZhiban:false,
+      zuzhangForm:{
+        reason:''
+      },
+      zhibanForm:{
+        reason:''
+      },
+      zhibancode:'',
+      zuzhangcode:'',
       dialogdept: false,
       dialogtongshi: false,
       dialogImageUrl: "",
@@ -1191,7 +1225,7 @@ export default {
         this.doneForm.ExceptionType = "";
       }
       if (data == 1) {
-        this.doneForm.IsInvolvedEquip = "";
+        this.doneForm.IsInvolvedEquip = "0";
         this.equipmodellist = [];
         this.equilist = [];
       }
@@ -1508,78 +1542,62 @@ export default {
       this.redeploydeptForm.WorkOrderCode = code;
     },
     redeployZuzhang(code) {
-      this.$confirm("确定转给组长吗?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          new Promise((resolve) => {
-            const params = {
-              workordercode: code,
-              toUserCode: null,
-              type: "1",
-            };
-            postTransfer(params).then((response) => {
-              if (response.state === "success") {
-                this.$message({
-                  type: "success",
-                  message: "操作成功!",
-                });
-                this.getListTask();
-              } else {
-                this.$message({
-                  type: "info",
-                  message: response.message,
-                });
-              }
-            });
-            resolve();
+      this.getReason('ZUZHANG')
+      this.dialogZuzhang = true
+      this.zuzhangcode = code
+    },
+    dialogTransferZuzhang(){
+      const params = {
+          workordercode: this.zuzhangcode,
+          toUserCode: null,
+          type: "1",
+          reason:this.zuzhangForm.reason
+      }
+      postTransfer(params).then((response)=>{
+        if(response.state === "success"){
+          this.$message({
+            type: "success",
+            message: "操作成功!",
           });
-        })
-        .catch(() => {
+          this.dialogZuzhang = false
+          this.zuzhangForm.reason = ''
+          this.getListTask();
+        }else {
           this.$message({
             type: "info",
-            message: "已取消",
+            message: response.message,
           });
-        });
+        }
+      })
     },
     redeployZhiban(code) {
-      this.$confirm("确定转给值班吗?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          new Promise((resolve) => {
-            const params = {
-              workordercode: code,
-              toUserCode: null,
-              type: "2",
-            };
-            postTransfer(params).then((response) => {
-              if (response.state === "success") {
-                this.$message({
-                  type: "success",
-                  message: "操作成功!",
-                });
-                this.getListTask();
-              } else {
-                this.$message({
-                  type: "info",
-                  message: response.message,
-                });
-              }
-            });
-            resolve();
+      this.getReason('ZUZHANG')
+      this.dialogZhiban = true
+      this.zhibancode = code
+    },
+    dialogTransferZhiban(){
+      const params = {
+          workordercode: this.zhibancode,
+          toUserCode: null,
+          type: "2",
+          reason:this.zhibanForm.reason
+      }
+      postTransfer(params).then((response)=>{
+        if(response.state === "success"){
+          this.$message({
+            type: "success",
+            message: "操作成功!",
           });
-        })
-        .catch(() => {
+          this.dialogZhiban = false
+          this.zhibanForm.reason = ''
+          this.getListTask();
+        }else {
           this.$message({
             type: "info",
-            message: "已取消",
+            message: response.message,
           });
-        });
+        }
+      })
     },
     postRedeployTongshiOrder() {
       // 转同事

CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -2,8 +2,8 @@
     "name" : "郑州人民医院综合服务保障调度平台",
     "appid" : "__UNI__5A5207D",
     "description" : "",
-    "versionName" : "1.2.14",
-    "versionCode" : 1212,
+    "versionName" : "1.2.15",
+    "versionCode" : 1213,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

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

@@ -82,6 +82,7 @@
 						<span v-if="$mHelper.findParents(orderTypeList,detailContentData.F_WorkOrderCategory).indexOf('标本')<0">{{ 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>
@@ -91,6 +92,14 @@
 					<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">
+				<text class="contentTitle">是否异常：</text>
+				<text class="contentText">{{ detailContentData.F_IsAbnormal==0?"否":"是" }}</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

@@ -4,7 +4,29 @@
 		<view class="form">
 			<!-- 基础表单校验 -->
 			<uni-forms >
-				<uni-forms-item label="附件" name="">
+				<table class="equipmentInfo"  v-if="$mHelper.findParents(orderTypeList,F_WorkOrderCategory).indexOf('急查标本')>=0">
+					<thead style="background-color: #fafafa;">
+						<tr class="trCon">
+							<td class="tdCon">物品</td>
+							<td class="tdCon">数量</td>
+							<td class="tdCon">实收数量</td>
+						</tr>
+					</thead>
+					<tbody>
+						<tr class="trCon" v-for="item in equipmentCon">
+							<td class="tdCon">{{$mHelper.findParents(orderTypeBBXXList,item.F_DicId)}}</td>
+							<td class="tdCon">{{item.F_Number}}</td>
+							<td class="tdCon"><uni-easyinput v-model="item.F_PaidInQuantity" placeholder="请输入数量" /></td>
+						</tr>
+					</tbody>
+				</table>			
+				<uni-forms-item label="接收人" name="" v-if="$mHelper.findParents(orderTypeList,F_WorkOrderCategory).indexOf('急查标本')>=0">
+					<uni-easyinput v-model="recipient" placeholder="请输入接收人工号" />
+				</uni-forms-item>
+				<uni-forms-item label="是否异常" name="" v-if="$mHelper.findParents(orderTypeList,F_WorkOrderCategory).indexOf('急查标本')>=0">
+					<uni-data-checkbox v-model="isabnormal" :localdata="F_IsycTypesList" />
+				</uni-forms-item>
+				<uni-forms-item label="附件" name="" v-if="$mHelper.findParents(orderTypeList,F_WorkOrderCategory).indexOf('急查标本')<0">
 					<view class="example-body">
 						<upload @post-string-data="getImgData" :imgUrlList="imgUrlList"></upload>
 					</view>
@@ -30,6 +52,15 @@
 		},
 		data() {
 			return {
+				F_IsycTypesList:[{
+					text: '否',
+					value: '0'
+				},{
+					text: '是',
+					value: '1'
+				}],	
+				recipient:'',
+				isabnormal:'0',
 				getFontSizeValue:'1rem',
 				workorderid: '',
 				remark: '',
@@ -39,31 +70,109 @@
 				imgUrlList: [], // 附件数据
 				imgIdList: [], //上传附件id
 				clickImgState: 0, // 图片回显的状态
+				orderTypeList: [], // 工单状态
+				equipmentCon:[],
+				orderTypeBBXXList:[],//标本信息
+				F_WorkOrderCategory:''
 			}
 		},
 		onLoad(option) {
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem'
 			this.workorderid = option.wid
 			this.state = option.state
+			this.getGongDanType()
+			this.getGongDanTypeBBXX()
+			this.getPSinfo()
 		},
 		methods: {
+			getGongDanType(){
+				let dataOrderType = []
+				const params = {
+					pid:0,
+					flag:1
+				}
+				this.$http.get("GongDanType/GetList",params).then((res)=>{
+					if(res.state.toLowerCase() ==="success"){
+						this.orderTypeList = res.data
+					}
+				})
+			},
+			getGongDanTypeBBXX(){
+				let dataOrderType = []
+				const params = {
+					pid:0,
+					flag:1
+				}
+				this.$http.get("GongDanType/GetBBXXList",params).then((res)=>{
+					if(res.state.toLowerCase() ==="success"){
+						this.orderTypeBBXXList = res.data
+					}
+				})
+			},
+			getPSinfo(){
+				const params = {
+					WorkOrderCode: this.workorderid,
+					type: 0
+				}
+				this.$http.get("Scheduling/GetWorkOrder",params).then((res)=>{
+					if(res.state.toLowerCase() ==="success"){
+						this.F_WorkOrderCategory = res.data[0].F_WorkOrderCategory
+						this.equipmentCon = res.data[0].PSInfo 
+					}
+				})
+			},
 			submit(ref,state) {
 				this.disabledButton = true
 				if(this.clickImgState == 1) {
 					this.File = this.$mHelper.getImgString(this.imgIdList)
 				}
+				
 				const params = {
 				  WorkOrderCode: this.workorderid,
 				  file: this.File,
-				  remark: this.remark
+				  remark: this.remark,
+				  isabnormal:this.isabnormal,
+				  recipient:this.recipient,
+				}
+				const psarr = []
+				this.equipmentCon.forEach(function(v,n){
+				  psarr.push({
+				    F_DetailId: v.F_DetailId,
+				    F_PaidInQuantity:v.F_PaidInQuantity
+				  })
+				})
+				params.pslist = JSON.parse(JSON.stringify(psarr))
+				if(this.$mHelper.findParents(this.orderTypeList,this.F_WorkOrderCategory).indexOf('急查标本')<0){
+					params.pslist = null
+					params.isabnormal = ''
+					params.recipient = ''
 				}
 				if(this.state == 1) {
-					this.$mHelper.httpPost("Scheduling/DealWorkOrder",params,2,res=>this.disabledButton=res)
+					this.$mHelper.httpPost("Scheduling/DealWorkOrder",this.serialize(params),2,res=>this.disabledButton=res)
 				}else if(this.state == 2) {
 					this.$mHelper.httpPost("Scheduling/CollectSpecimens",params,2,res=>this.disabledButton=res)					
 				}
 				
 			},
+			serialize(obj, prefix) {
+				const str = []
+				let p
+				if (obj.length === 0) {
+					//  str.push(encodeURIComponent(prefix) + '=1')  
+				} else {
+					for (p in obj) {
+						if (obj.hasOwnProperty(p)) {
+							const k = prefix ? prefix + '[' + p + ']' : p
+							let v = obj[p]
+							if (v instanceof Date) {
+								v = parseTime(v)
+							}
+							str.push((v !== null && typeof v === 'object') ? this.serialize(v, k) : encodeURIComponent(k) +'=' + encodeURIComponent(v))
+						}
+					}
+				}
+				return str.join('&')
+			},
 			// 上传图片
 			getImgData(data) {
 				this.clickImgState = 1
@@ -93,4 +202,27 @@
   }
 
 }
+.equipmentInfo{
+			width: 100%;
+			margin-top: 15px;
+			border: 1px solid rgb(229, 229, 229);
+			box-shadow: 0px 4px 16px 0px rgba(69, 91, 99, 0.05);
+			margin-bottom: 20px;
+			border-radius: 5px;
+			
+			.trCon {
+				width: 100%;
+				// font-size: 14px;
+			
+				.tdCon {
+					display: inline-block;
+					padding: 10px 0px;
+					color: rgb(102, 102, 102);
+					width: 30%;
+					padding-right: 5px;
+					text-align: center;
+				}
+			}
+			
+		}
 </style>

CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairDetail/finishDetail/finishDetail.vue

@@ -13,14 +13,14 @@
 					<uni-data-select v-model="valiFormData.exceptionType" :localdata="exceptionTypeList">
 					</uni-data-select>
 				</uni-forms-item>
-				<uni-forms-item label="是否涉及耗材" name="isEquipment" v-show="valiFormData.finishType == 0">
+				<uni-forms-item label="是否涉及耗材" name="isEquipment">
 					<uni-data-checkbox v-model="valiFormData.isEquipment" :localdata="equipments" />
 				</uni-forms-item>
-				<uni-forms-item label="耗材信息" name="equipmentid" v-show="valiFormData.isEquipment == 1 && valiFormData.finishType == 0">
+				<uni-forms-item label="耗材信息" name="equipmentid" v-show="valiFormData.isEquipment == 1">
 					<luyj-select-lay :value="valiFormData.equipmentid" lay-omit name="name" :options="equipmentList" :zindex="1" slabel='text' @selectitem="selectitem">
 					</luyj-select-lay>
 				</uni-forms-item>
-				<table class="equipmentInfo" v-show="equipmentCon.length>0 && valiFormData.finishType == 0">
+				<table class="equipmentInfo" v-show="equipmentCon.length>0">
 					<thead style="background-color: #fafafa;">
 						<tr class="trCon">
 							<td class="tdCon">耗材名称</td>
@@ -235,12 +235,12 @@
 					this.disabledButton = false
 					return
 				}
-				if (this.valiFormData.finishType == 1) {
-					this.equipmentCon = []
-					this.valiFormData.isEquipment = 0
-				} else {
-					this.valiFormData.exceptionType = ''
-				}
+				// if (this.valiFormData.finishType == 1) {
+				// 	this.equipmentCon = []
+				// 	this.valiFormData.isEquipment = 0
+				// } else {
+				// 	this.valiFormData.exceptionType = ''
+				// }
 				this.$refs[ref].validate().then(res => {
 					const params = {
 						File: this.valiFormData.file,

CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/button/button.vue

@@ -29,6 +29,16 @@
 				</uni-popup-dialog>
 			</uni-popup>
 		</view>
+		<view>
+			<uni-popup ref="transferDialog" type="dialog">
+				<uni-popup-dialog ref="inputClose" mode="input" title="原因" @confirm="dialogTransferConfirm">
+					<view style="width:100%;">
+						<dictionaries-select :flag="flag" @post-select-dic="postTransferDic" style="margin-bottom: 20px;" ></dictionaries-select>
+						<!-- <uni-easyinput type="textarea" autoHeight maxlength="100" v-model="reason" placeholder="请输入原因"/> -->
+					</view>
+				</uni-popup-dialog>
+			</uni-popup>
+		</view>
 	</view>
 </template>
 
@@ -81,6 +91,8 @@
 		},
 		data() {
 			return {
+				transfertype:1,
+				reason:'',
 				flag: '',
 				key: 0,
 				value: '',
@@ -112,6 +124,9 @@
 				this.key = Number(e.split(',')[0])
 				this.value = e.split(',')[1]
 			},
+			postTransferDic(e){
+				this.reason = e.split(',')[1]
+			},
 			callBtnMethods(methodName) {
 				this[methodName]();
 			},
@@ -276,8 +291,11 @@
 				this.confirmationAPI("FaultRepair/Arrive", "信息", "是否要到达", "取消了到达")
 			},
 			// 转值班
-			trunWorkBtn() {
-				this.confirmationAPI("FaultRepair/Transfer", "转值班", "是否要转值班", "已经取消")
+			trunWorkBtn() {				
+				// this.confirmationAPI("FaultRepair/Transfer", "转值班", "是否要转值班", "已经取消")
+				this.flag = 'ZUZHANG'
+				this.transfertype = 2
+				this.$refs.transferDialog.open()
 			},
 			// 内协作
 			inWorkBtn() {
@@ -301,7 +319,10 @@
 			},
 			// 转组长
 			groupLeaderBtn() {
-				this.confirmationAPI("FaultRepair/Transfer", "转组长", "是否要转组长", "已经取消")
+				// this.confirmationAPI("FaultRepair/Transfer", "转组长", "是否要转组长", "已经取消")
+				this.flag = 'ZUZHANG'
+				this.transfertype = 1
+				this.$refs.transferDialog.open()
 			},
 			/**
 			* 综合调度（按钮）
@@ -437,6 +458,16 @@
 				this.auditPlaceholder = '请输入要催办原因'
 				this.$refs.inputDialog.open()
 			},
+			//转组长
+			dialogTransferConfirm(){
+				const params = {
+					workordercode: this.wid,
+					toUserCode: '',			
+					type:this.transfertype,
+					reason: this.reason
+				}
+				this.workOrderContent("FaultRepair/Transfer",params)
+			},
 			// 原因下拉框
 			dialogSelectConfirm() {
 				uni.showLoading({

CallCenterWeb.UI/RMYYAPP/unpackage/cache/certdataios

@@ -1,3 +1,3 @@
-iosProfile=E:/desktopFile/证书/RMYY证书/ios/4.0/正式/wuyuan (2).mobileprovision
-ioscertFile=E:/desktopFile/证书/RMYY证书/ios/4.0/正式/证书.p12
+iosProfile=E:/WorkPlace/RMYY/CallCenterWeb.UI/证书/ios/正式/wuyuan (2).mobileprovision
+ioscertFile=E:/WorkPlace/RMYY/CallCenterWeb.UI/证书/ios/正式/证书.p12
 ioscertPassword=LN4Bq2cDrCPQMwql//0+Pw==