liuzhihui %!s(int64=2) %!d(string=hace) años
padre
commit
722968766b

+ 2 - 2
CallCenterWeb.UI/RMYY/src/api/comDispatch/addOrEditDispatch.js

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

+ 55 - 4
CallCenterWeb.UI/RMYY/src/components/button/orderList.vue

@@ -328,8 +328,26 @@
328 328
     </el-dialog>
329 329
     <!-- 综合调度送达 -->
330 330
     <el-dialog :visible.sync="dialogStatus.dialog_dispatch_daoda" title="送达">
331
+      <el-table :data="dispatchhaocaiarr" border stripe v-if="bbtags.indexOf('急查标本')>=0">
332
+        <el-table-column prop="F_DicName" label="物品" align="center" />
333
+        <el-table-column prop="F_Number" label="数量" align="center" />
334
+        <el-table-column prop="" label="实收数量" align="center" >
335
+          <template slot-scope="scope">
336
+            <el-input v-model="scope.row.F_PaidInQuantity" placeholder="请输入数量"></el-input>
337
+          </template>
338
+        </el-table-column>
339
+      </el-table>
331 340
       <el-form ref="dealWorkForm" :model="dealWorkForm" :rules="rules" label-width="100px">
332
-        <el-form-item label="附件">
341
+        <el-form-item label="接收人" v-if="bbtags.indexOf('急查标本')>=0">
342
+          <el-input v-model="dealWorkForm.recipient" placeholder="请输入接收人工号"></el-input>
343
+        </el-form-item>
344
+        <el-form-item label="是否异常" v-if="bbtags.indexOf('急查标本')>=0">
345
+          <el-radio-group v-model="dealWorkForm.isabnormal">
346
+            <el-radio label="0">否</el-radio>
347
+            <el-radio label="1">是</el-radio>
348
+          </el-radio-group>
349
+        </el-form-item>
350
+        <el-form-item label="附件" v-if="bbtags.indexOf('急查标本')<0">
333 351
           <el-upload :headers="headers" :on-remove="handle_remove" :on-success="handle_success"
334 352
             :file-list="dealWorkFormFile" :action="imgUrl" list-type="picture-card">
335 353
             <i class="el-icon-plus" />
@@ -528,6 +546,8 @@
528 546
         fid: '',
529 547
         rowdata: {},
530 548
         haocaiarr: [],
549
+        bbtags:'',
550
+        dispatchhaocaiarr:[],
531 551
         reason1: '',
532 552
         reason2: '',
533 553
         reason3: '',
@@ -727,7 +747,9 @@
727 747
         },
728 748
         dealWorkForm: {
729 749
           file: '',
730
-          remark: ''
750
+          remark: '',
751
+          recipient:'',
752
+          isabnormal:'0'
731 753
         },
732 754
         collectForm: {
733 755
           jcnum:'0',
@@ -859,14 +881,27 @@
859 881
           // this.PictureUrl = res.data[0].PictureUrl
860 882
         })
861 883
       },
884
+      getDispatchHaocai(){
885
+        const params = {
886
+          WorkOrderCode: this.wocode,
887
+          type: 0
888
+        }
889
+        GetOrderDetail(params).then(res => {
890
+          this.bbtags = this.$store.getters.workTypeMap[parseInt(res.data[0].F_WorkOrderCategory)].text
891
+          // console.log(this.bbtags)
892
+          this.dispatchhaocaiarr = res.data[0].PSInfo
893
+          for (var i = 0; i < res.data[0].PSInfo.length; i++) {
894
+            res.data[0].PSInfo[i].F_DicName = this.$store.getters.bbxxTypeMap[parseInt(res.data[0].PSInfo[i].F_DicId)].text;
895
+          }
896
+          // console.log(res.data[0].PSInfo)
897
+        })
898
+      },
862 899
       getFileUrl() {
863 900
         const params = {
864 901
           WorkOrderCode: this.wocode,
865 902
           type: 0
866 903
         }
867 904
         GetFaultRepairDetail(params).then(res => {
868
-          // this.haocaiarr = res.data[0].Equips
869
-          //this.FileUrl = res.data[0].FileUrl
870 905
           this.PictureUrl = res.data[0].PictureUrl
871 906
         })
872 907
       },
@@ -1049,6 +1084,9 @@
1049 1084
           this.getHaocai()
1050 1085
           this.getFileUrl()
1051 1086
         }
1087
+        if(name === 'dispatch_daoda'){
1088
+          this.getDispatchHaocai()
1089
+        }
1052 1090
         if (name === 'fanxiu') {
1053 1091
           this.getReason('FXYY')
1054 1092
         }
@@ -1272,6 +1310,19 @@
1272 1310
           if (valid) {
1273 1311
             console.log(formName)
1274 1312
             if (formName === 'dealWorkForm') {
1313
+              const psarr = []
1314
+              this.dispatchhaocaiarr.forEach(function(v,n){
1315
+                psarr.push({
1316
+                  F_DetailId: v.F_DetailId,
1317
+                  F_PaidInQuantity:v.F_PaidInQuantity
1318
+                })
1319
+              })
1320
+              this.dealWorkForm.pslist = psarr
1321
+              if(this.bbtags.indexOf('急查标本')<0){
1322
+                this.dealWorkForm.pslist = []
1323
+                this.dealWorkForm.recipient = ''
1324
+                this.dealWorkForm.isabnormal =''
1325
+              }
1275 1326
               if (this.dealWorkForm.file === '') {
1276 1327
                 // this.$message.error('请上传附件')
1277 1328
                 // return

+ 9 - 1
CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

@@ -84,9 +84,17 @@
84 84
                   <span v-if="item.F_IsBorrow==2">(还)</span>
85 85
                 </td>
86 86
                 <th v-if="!item.F_ToDept">数量:</th>
87
-                <td v-if="!item.F_ToDept">{{ item.F_Number }}</td>
87
+                <td v-if="!item.F_ToDept">{{ item.F_Number }}<span v-if="item.F_PaidInQuantity">(实收数量:{{item.F_PaidInQuantity}})</span></td>
88 88
                 <th>-</th>
89 89
               </tr>
90
+              <tr v-if="orderDetailData.F_Recipient">
91
+                <th>接收人:</th>
92
+                <td colspan="5">{{ orderDetailData.F_Recipient}}</td>
93
+              </tr>
94
+              <tr v-if="orderDetailData.F_Recipient">
95
+                <th>是否异常:</th>
96
+                <td colspan="5">{{ orderDetailData.F_IsAbnormal == 0 ? "否" : "是" }}</td>
97
+              </tr>
90 98
               <!-- <tr v-if="orderDetailData.F_WorkOrderCodes">
91 99
                 <th>关联工单:</th>
92 100
                 <td colspan="5">

+ 2 - 2
CallCenterWeb.UI/RMYY/src/views/equipmentManage/equipmentList/index.vue

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

+ 103 - 85
CallCenterWeb.UI/RMYY/src/views/faultRepairManagement/repairList/index.vue

@@ -315,7 +315,50 @@
315 315
       class="pagination"
316 316
       @pagination="getListTask"
317 317
     />
318
-
318
+    <el-dialog :visible.sync="dialogZuzhang" title="转组长">
319
+      <el-form ref="zuzhangForm" :rules="rules" label-width="100px">
320
+        <el-form-item label="原因">
321
+          <el-select
322
+            v-model="zuzhangForm.reason"
323
+            clearable
324
+            placeholder="请选择原因"
325
+          >
326
+            <el-option
327
+              v-for="item in reasonarr1"
328
+              :key="item.F_DictionaryValueId"
329
+              :label="item.F_Name"
330
+              :value="item.F_Name"
331
+            />
332
+          </el-select>
333
+        </el-form-item>
334
+      </el-form>
335
+      <div slot="footer" class="dialog-footer">
336
+        <el-button @click="dialogZuzhang = false">取 消</el-button>
337
+        <el-button type="primary" @click="dialogTransferZuzhang">确 定</el-button>
338
+      </div>
339
+    </el-dialog>
340
+    <el-dialog :visible.sync="dialogZhiban" title="转值班">
341
+      <el-form ref="zhibanForm" :rules="rules" label-width="100px">
342
+        <el-form-item label="原因">
343
+          <el-select
344
+            v-model="zhibanForm.reason"
345
+            clearable
346
+            placeholder="请选择原因"
347
+          >
348
+            <el-option
349
+              v-for="item in reasonarr1"
350
+              :key="item.F_DictionaryValueId"
351
+              :label="item.F_Name"
352
+              :value="item.F_Name"
353
+            />
354
+          </el-select>
355
+        </el-form-item>
356
+      </el-form>
357
+      <div slot="footer" class="dialog-footer">
358
+        <el-button @click="dialogZhiban = false">取 消</el-button>
359
+        <el-button type="primary" @click="dialogTransferZhiban">确 定</el-button>
360
+      </div>
361
+    </el-dialog>
319 362
     <el-dialog :visible.sync="dialogHangUp" title="挂起">
320 363
       <el-form ref="hangupForm" :rules="rules" label-width="100px">
321 364
         <el-form-item label="原因">
@@ -789,7 +832,7 @@
789 832
             />
790 833
           </el-select>
791 834
         </el-form-item>
792
-        <el-form-item v-if="doneForm.type == '0'" label="是否涉及耗材">
835
+        <el-form-item label="是否涉及耗材">
793 836
           <el-radio-group
794 837
             v-model="doneForm.IsInvolvedEquip"
795 838
             style="margin-right: 15px"
@@ -798,25 +841,6 @@
798 841
             <el-radio label="0">否</el-radio>
799 842
             <el-radio label="1">是</el-radio>
800 843
           </el-radio-group>
801
-          <!-- <el-select
802
-            v-if="doneForm.IsInvolvedEquip == '1'"
803
-            filterable
804
-            v-model="equilist"
805
-            placeholder="请选择耗材"
806
-            size="medium"
807
-            multiple
808
-            collapse-tags
809
-            clearable
810
-            style="width: 80%"
811
-            @change="equiChange"
812
-          >
813
-            <el-option
814
-              v-for="(item, index) in equiArr"
815
-              :key="index"
816
-              :label="item.F_EquipName + '(' + item.F_EquipNumber + ')'"
817
-              :value="item.F_EquipID"
818
-            />
819
-          </el-select> -->
820 844
         </el-form-item>
821 845
         <el-form-item v-if="doneForm.IsInvolvedEquip == '1'" label="耗材信息">
822 846
           <el-select
@@ -838,7 +862,7 @@
838 862
             />
839 863
           </el-select>
840 864
         </el-form-item>
841
-        <el-form-item v-if="doneForm.type == '0' && equilist.length > 0">
865
+        <el-form-item v-if="equilist.length > 0">
842 866
           <el-table :data="equipmodellist" border stripe style="width: 100%">
843 867
             <el-table-column prop="F_EquipName" label="耗材名称" />
844 868
             <el-table-column prop="F_EquipNumber" label="规格型号" />
@@ -966,6 +990,16 @@ export default {
966 990
   },
967 991
   data() {
968 992
     return {
993
+      dialogZuzhang:false,
994
+      dialogZhiban:false,
995
+      zuzhangForm:{
996
+        reason:''
997
+      },
998
+      zhibanForm:{
999
+        reason:''
1000
+      },
1001
+      zhibancode:'',
1002
+      zuzhangcode:'',
969 1003
       dialogdept: false,
970 1004
       dialogtongshi: false,
971 1005
       dialogImageUrl: "",
@@ -1191,7 +1225,7 @@ export default {
1191 1225
         this.doneForm.ExceptionType = "";
1192 1226
       }
1193 1227
       if (data == 1) {
1194
-        this.doneForm.IsInvolvedEquip = "";
1228
+        this.doneForm.IsInvolvedEquip = "0";
1195 1229
         this.equipmodellist = [];
1196 1230
         this.equilist = [];
1197 1231
       }
@@ -1508,78 +1542,62 @@ export default {
1508 1542
       this.redeploydeptForm.WorkOrderCode = code;
1509 1543
     },
1510 1544
     redeployZuzhang(code) {
1511
-      this.$confirm("确定转给组长吗?", "提示", {
1512
-        confirmButtonText: "确定",
1513
-        cancelButtonText: "取消",
1514
-        type: "warning",
1515
-      })
1516
-        .then(() => {
1517
-          new Promise((resolve) => {
1518
-            const params = {
1519
-              workordercode: code,
1520
-              toUserCode: null,
1521
-              type: "1",
1522
-            };
1523
-            postTransfer(params).then((response) => {
1524
-              if (response.state === "success") {
1525
-                this.$message({
1526
-                  type: "success",
1527
-                  message: "操作成功!",
1528
-                });
1529
-                this.getListTask();
1530
-              } else {
1531
-                this.$message({
1532
-                  type: "info",
1533
-                  message: response.message,
1534
-                });
1535
-              }
1536
-            });
1537
-            resolve();
1545
+      this.getReason('ZUZHANG')
1546
+      this.dialogZuzhang = true
1547
+      this.zuzhangcode = code
1548
+    },
1549
+    dialogTransferZuzhang(){
1550
+      const params = {
1551
+          workordercode: this.zuzhangcode,
1552
+          toUserCode: null,
1553
+          type: "1",
1554
+          reason:this.zuzhangForm.reason
1555
+      }
1556
+      postTransfer(params).then((response)=>{
1557
+        if(response.state === "success"){
1558
+          this.$message({
1559
+            type: "success",
1560
+            message: "操作成功!",
1538 1561
           });
1539
-        })
1540
-        .catch(() => {
1562
+          this.dialogZuzhang = false
1563
+          this.zuzhangForm.reason = ''
1564
+          this.getListTask();
1565
+        }else {
1541 1566
           this.$message({
1542 1567
             type: "info",
1543
-            message: "已取消",
1568
+            message: response.message,
1544 1569
           });
1545
-        });
1570
+        }
1571
+      })
1546 1572
     },
1547 1573
     redeployZhiban(code) {
1548
-      this.$confirm("确定转给值班吗?", "提示", {
1549
-        confirmButtonText: "确定",
1550
-        cancelButtonText: "取消",
1551
-        type: "warning",
1552
-      })
1553
-        .then(() => {
1554
-          new Promise((resolve) => {
1555
-            const params = {
1556
-              workordercode: code,
1557
-              toUserCode: null,
1558
-              type: "2",
1559
-            };
1560
-            postTransfer(params).then((response) => {
1561
-              if (response.state === "success") {
1562
-                this.$message({
1563
-                  type: "success",
1564
-                  message: "操作成功!",
1565
-                });
1566
-                this.getListTask();
1567
-              } else {
1568
-                this.$message({
1569
-                  type: "info",
1570
-                  message: response.message,
1571
-                });
1572
-              }
1573
-            });
1574
-            resolve();
1574
+      this.getReason('ZUZHANG')
1575
+      this.dialogZhiban = true
1576
+      this.zhibancode = code
1577
+    },
1578
+    dialogTransferZhiban(){
1579
+      const params = {
1580
+          workordercode: this.zhibancode,
1581
+          toUserCode: null,
1582
+          type: "2",
1583
+          reason:this.zhibanForm.reason
1584
+      }
1585
+      postTransfer(params).then((response)=>{
1586
+        if(response.state === "success"){
1587
+          this.$message({
1588
+            type: "success",
1589
+            message: "操作成功!",
1575 1590
           });
1576
-        })
1577
-        .catch(() => {
1591
+          this.dialogZhiban = false
1592
+          this.zhibanForm.reason = ''
1593
+          this.getListTask();
1594
+        }else {
1578 1595
           this.$message({
1579 1596
             type: "info",
1580
-            message: "已取消",
1597
+            message: response.message,
1581 1598
           });
1582
-        });
1599
+        }
1600
+      })
1583 1601
     },
1584 1602
     postRedeployTongshiOrder() {
1585 1603
       // 转同事

+ 2 - 2
CallCenterWeb.UI/RMYYAPP/manifest.json

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

+ 9 - 0
CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/comDispatchDetail/comDispatchDetail.vue

@@ -82,6 +82,7 @@
82 82
 						<span v-if="$mHelper.findParents(orderTypeList,detailContentData.F_WorkOrderCategory).indexOf('标本')<0">{{ item.F_DicName + '('+ item.F_Number + ')'}}</span>
83 83
 						<span v-if="item.F_IsBorrow==1">(借)</span>
84 84
 						<span v-if="item.F_IsBorrow==2">(还)</span>
85
+						<span v-if="item.F_PaidInQuantity">(实收数量:{{item.F_PaidInQuantity}})</span>
85 86
 						<span v-else></span>
86 87
 					</div>
87 88
 				</div>
@@ -91,6 +92,14 @@
91 92
 					<text v-else class="contentText"></text>
92 93
 				</view> -->
93 94
 			</view>
95
+			<view class="contentTable" v-if="detailContentData.F_Recipient">
96
+				<text class="contentTitle">接收人:</text>
97
+				<text class="contentText">{{ detailContentData.F_Recipient }}</text>
98
+			</view>
99
+			<view class="contentTable" v-if="detailContentData.F_Recipient">
100
+				<text class="contentTitle">是否异常:</text>
101
+				<text class="contentText">{{ detailContentData.F_IsAbnormal==0?"否":"是" }}</text>
102
+			</view>
94 103
 			<!-- <view class="contentTable" v-if="detailContentData.F_WorkOrderCodes">
95 104
 				<text class="contentTitle">关联工单:</text>
96 105
 				<text class="contentText">{{ detailContentData.F_WorkOrderCodes }}</text>

+ 135 - 3
CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/comDispatchDetail/dealDetail/dealDetail.vue

@@ -4,7 +4,29 @@
4 4
 		<view class="form">
5 5
 			<!-- 基础表单校验 -->
6 6
 			<uni-forms >
7
-				<uni-forms-item label="附件" name="">
7
+				<table class="equipmentInfo"  v-if="$mHelper.findParents(orderTypeList,F_WorkOrderCategory).indexOf('急查标本')>=0">
8
+					<thead style="background-color: #fafafa;">
9
+						<tr class="trCon">
10
+							<td class="tdCon">物品</td>
11
+							<td class="tdCon">数量</td>
12
+							<td class="tdCon">实收数量</td>
13
+						</tr>
14
+					</thead>
15
+					<tbody>
16
+						<tr class="trCon" v-for="item in equipmentCon">
17
+							<td class="tdCon">{{$mHelper.findParents(orderTypeBBXXList,item.F_DicId)}}</td>
18
+							<td class="tdCon">{{item.F_Number}}</td>
19
+							<td class="tdCon"><uni-easyinput v-model="item.F_PaidInQuantity" placeholder="请输入数量" /></td>
20
+						</tr>
21
+					</tbody>
22
+				</table>			
23
+				<uni-forms-item label="接收人" name="" v-if="$mHelper.findParents(orderTypeList,F_WorkOrderCategory).indexOf('急查标本')>=0">
24
+					<uni-easyinput v-model="recipient" placeholder="请输入接收人工号" />
25
+				</uni-forms-item>
26
+				<uni-forms-item label="是否异常" name="" v-if="$mHelper.findParents(orderTypeList,F_WorkOrderCategory).indexOf('急查标本')>=0">
27
+					<uni-data-checkbox v-model="isabnormal" :localdata="F_IsycTypesList" />
28
+				</uni-forms-item>
29
+				<uni-forms-item label="附件" name="" v-if="$mHelper.findParents(orderTypeList,F_WorkOrderCategory).indexOf('急查标本')<0">
8 30
 					<view class="example-body">
9 31
 						<upload @post-string-data="getImgData" :imgUrlList="imgUrlList"></upload>
10 32
 					</view>
@@ -30,6 +52,15 @@
30 52
 		},
31 53
 		data() {
32 54
 			return {
55
+				F_IsycTypesList:[{
56
+					text: '否',
57
+					value: '0'
58
+				},{
59
+					text: '是',
60
+					value: '1'
61
+				}],	
62
+				recipient:'',
63
+				isabnormal:'0',
33 64
 				getFontSizeValue:'1rem',
34 65
 				workorderid: '',
35 66
 				remark: '',
@@ -39,31 +70,109 @@
39 70
 				imgUrlList: [], // 附件数据
40 71
 				imgIdList: [], //上传附件id
41 72
 				clickImgState: 0, // 图片回显的状态
73
+				orderTypeList: [], // 工单状态
74
+				equipmentCon:[],
75
+				orderTypeBBXXList:[],//标本信息
76
+				F_WorkOrderCategory:''
42 77
 			}
43 78
 		},
44 79
 		onLoad(option) {
45 80
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem'
46 81
 			this.workorderid = option.wid
47 82
 			this.state = option.state
83
+			this.getGongDanType()
84
+			this.getGongDanTypeBBXX()
85
+			this.getPSinfo()
48 86
 		},
49 87
 		methods: {
88
+			getGongDanType(){
89
+				let dataOrderType = []
90
+				const params = {
91
+					pid:0,
92
+					flag:1
93
+				}
94
+				this.$http.get("GongDanType/GetList",params).then((res)=>{
95
+					if(res.state.toLowerCase() ==="success"){
96
+						this.orderTypeList = res.data
97
+					}
98
+				})
99
+			},
100
+			getGongDanTypeBBXX(){
101
+				let dataOrderType = []
102
+				const params = {
103
+					pid:0,
104
+					flag:1
105
+				}
106
+				this.$http.get("GongDanType/GetBBXXList",params).then((res)=>{
107
+					if(res.state.toLowerCase() ==="success"){
108
+						this.orderTypeBBXXList = res.data
109
+					}
110
+				})
111
+			},
112
+			getPSinfo(){
113
+				const params = {
114
+					WorkOrderCode: this.workorderid,
115
+					type: 0
116
+				}
117
+				this.$http.get("Scheduling/GetWorkOrder",params).then((res)=>{
118
+					if(res.state.toLowerCase() ==="success"){
119
+						this.F_WorkOrderCategory = res.data[0].F_WorkOrderCategory
120
+						this.equipmentCon = res.data[0].PSInfo 
121
+					}
122
+				})
123
+			},
50 124
 			submit(ref,state) {
51 125
 				this.disabledButton = true
52 126
 				if(this.clickImgState == 1) {
53 127
 					this.File = this.$mHelper.getImgString(this.imgIdList)
54 128
 				}
129
+				
55 130
 				const params = {
56 131
 				  WorkOrderCode: this.workorderid,
57 132
 				  file: this.File,
58
-				  remark: this.remark
133
+				  remark: this.remark,
134
+				  isabnormal:this.isabnormal,
135
+				  recipient:this.recipient,
136
+				}
137
+				const psarr = []
138
+				this.equipmentCon.forEach(function(v,n){
139
+				  psarr.push({
140
+				    F_DetailId: v.F_DetailId,
141
+				    F_PaidInQuantity:v.F_PaidInQuantity
142
+				  })
143
+				})
144
+				params.pslist = JSON.parse(JSON.stringify(psarr))
145
+				if(this.$mHelper.findParents(this.orderTypeList,this.F_WorkOrderCategory).indexOf('急查标本')<0){
146
+					params.pslist = null
147
+					params.isabnormal = ''
148
+					params.recipient = ''
59 149
 				}
60 150
 				if(this.state == 1) {
61
-					this.$mHelper.httpPost("Scheduling/DealWorkOrder",params,2,res=>this.disabledButton=res)
151
+					this.$mHelper.httpPost("Scheduling/DealWorkOrder",this.serialize(params),2,res=>this.disabledButton=res)
62 152
 				}else if(this.state == 2) {
63 153
 					this.$mHelper.httpPost("Scheduling/CollectSpecimens",params,2,res=>this.disabledButton=res)					
64 154
 				}
65 155
 				
66 156
 			},
157
+			serialize(obj, prefix) {
158
+				const str = []
159
+				let p
160
+				if (obj.length === 0) {
161
+					//  str.push(encodeURIComponent(prefix) + '=1')  
162
+				} else {
163
+					for (p in obj) {
164
+						if (obj.hasOwnProperty(p)) {
165
+							const k = prefix ? prefix + '[' + p + ']' : p
166
+							let v = obj[p]
167
+							if (v instanceof Date) {
168
+								v = parseTime(v)
169
+							}
170
+							str.push((v !== null && typeof v === 'object') ? this.serialize(v, k) : encodeURIComponent(k) +'=' + encodeURIComponent(v))
171
+						}
172
+					}
173
+				}
174
+				return str.join('&')
175
+			},
67 176
 			// 上传图片
68 177
 			getImgData(data) {
69 178
 				this.clickImgState = 1
@@ -93,4 +202,27 @@
93 202
   }
94 203
 
95 204
 }
205
+.equipmentInfo{
206
+			width: 100%;
207
+			margin-top: 15px;
208
+			border: 1px solid rgb(229, 229, 229);
209
+			box-shadow: 0px 4px 16px 0px rgba(69, 91, 99, 0.05);
210
+			margin-bottom: 20px;
211
+			border-radius: 5px;
212
+			
213
+			.trCon {
214
+				width: 100%;
215
+				// font-size: 14px;
216
+			
217
+				.tdCon {
218
+					display: inline-block;
219
+					padding: 10px 0px;
220
+					color: rgb(102, 102, 102);
221
+					width: 30%;
222
+					padding-right: 5px;
223
+					text-align: center;
224
+				}
225
+			}
226
+			
227
+		}
96 228
 </style>

+ 9 - 9
CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairDetail/finishDetail/finishDetail.vue

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

+ 34 - 3
CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/button/button.vue

@@ -29,6 +29,16 @@
29 29
 				</uni-popup-dialog>
30 30
 			</uni-popup>
31 31
 		</view>
32
+		<view>
33
+			<uni-popup ref="transferDialog" type="dialog">
34
+				<uni-popup-dialog ref="inputClose" mode="input" title="原因" @confirm="dialogTransferConfirm">
35
+					<view style="width:100%;">
36
+						<dictionaries-select :flag="flag" @post-select-dic="postTransferDic" style="margin-bottom: 20px;" ></dictionaries-select>
37
+						<!-- <uni-easyinput type="textarea" autoHeight maxlength="100" v-model="reason" placeholder="请输入原因"/> -->
38
+					</view>
39
+				</uni-popup-dialog>
40
+			</uni-popup>
41
+		</view>
32 42
 	</view>
33 43
 </template>
34 44
 
@@ -81,6 +91,8 @@
81 91
 		},
82 92
 		data() {
83 93
 			return {
94
+				transfertype:1,
95
+				reason:'',
84 96
 				flag: '',
85 97
 				key: 0,
86 98
 				value: '',
@@ -112,6 +124,9 @@
112 124
 				this.key = Number(e.split(',')[0])
113 125
 				this.value = e.split(',')[1]
114 126
 			},
127
+			postTransferDic(e){
128
+				this.reason = e.split(',')[1]
129
+			},
115 130
 			callBtnMethods(methodName) {
116 131
 				this[methodName]();
117 132
 			},
@@ -276,8 +291,11 @@
276 291
 				this.confirmationAPI("FaultRepair/Arrive", "信息", "是否要到达", "取消了到达")
277 292
 			},
278 293
 			// 转值班
279
-			trunWorkBtn() {
280
-				this.confirmationAPI("FaultRepair/Transfer", "转值班", "是否要转值班", "已经取消")
294
+			trunWorkBtn() {				
295
+				// this.confirmationAPI("FaultRepair/Transfer", "转值班", "是否要转值班", "已经取消")
296
+				this.flag = 'ZUZHANG'
297
+				this.transfertype = 2
298
+				this.$refs.transferDialog.open()
281 299
 			},
282 300
 			// 内协作
283 301
 			inWorkBtn() {
@@ -301,7 +319,10 @@
301 319
 			},
302 320
 			// 转组长
303 321
 			groupLeaderBtn() {
304
-				this.confirmationAPI("FaultRepair/Transfer", "转组长", "是否要转组长", "已经取消")
322
+				// this.confirmationAPI("FaultRepair/Transfer", "转组长", "是否要转组长", "已经取消")
323
+				this.flag = 'ZUZHANG'
324
+				this.transfertype = 1
325
+				this.$refs.transferDialog.open()
305 326
 			},
306 327
 			/**
307 328
 			* 综合调度(按钮)
@@ -437,6 +458,16 @@
437 458
 				this.auditPlaceholder = '请输入要催办原因'
438 459
 				this.$refs.inputDialog.open()
439 460
 			},
461
+			//转组长
462
+			dialogTransferConfirm(){
463
+				const params = {
464
+					workordercode: this.wid,
465
+					toUserCode: '',			
466
+					type:this.transfertype,
467
+					reason: this.reason
468
+				}
469
+				this.workOrderContent("FaultRepair/Transfer",params)
470
+			},
440 471
 			// 原因下拉框
441 472
 			dialogSelectConfirm() {
442 473
 				uni.showLoading({

+ 2 - 2
CallCenterWeb.UI/RMYYAPP/unpackage/cache/certdataios

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