xgai

CallCenterWeb.UI/RMYY/src/api/commonAPI.js

@@ -145,6 +145,14 @@ export function getClassByDeptId(params) {
     params
   })
 }
+// 清空排班信息
+export function getDelClass(params) {
+  return request({
+    url: 'GroupClass/DelClass',
+    method: 'get',
+    params
+  })
+}
 // 获取标本tree
 export function GetBBXXList(params) {
   return request({

CallCenterWeb.UI/RMYY/src/components/workOrder/dispatching/addOrEditDispatch.vue

@@ -45,7 +45,7 @@
         </el-row>
         <el-row v-if="typeAlias === '2001'">
           <el-row v-for="(item, index) in devList" :key="index">
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item prop="devname">
                 <el-select :disabled="butIsDisabled" v-model="item.devname" placeholder="请选择设备" @change="selectChange">
                   <el-option v-for="item in equipArr" :key="item.F_DictionaryValueId" :label="item.F_Name"
@@ -53,9 +53,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item prop="num">
-                <el-input-number :disabled="butIsDisabled" v-model="item.num" :min="1" size="medium" />
+                <el-input-number :disabled="butIsDisabled" v-model="item.num" :min="1" size="mini" />
+                <!-- <el-button type="primary" icon="el-icon-close" circle @click="removeItem(index)" /> -->
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item prop="F_IsBorrow">
+                <el-radio-group v-model="item.F_IsBorrow">
+                  <el-radio label="1">借</el-radio>
+                  <el-radio label="2">还</el-radio>
+                </el-radio-group>
                 <el-button type="primary" icon="el-icon-close" circle @click="removeItem(index)" />
               </el-form-item>
             </el-col>
@@ -97,7 +106,7 @@
         </el-row>
         <el-row v-if="typeAlias === '2003'">
           <el-row v-for="(item, index) in devList" :key="index">
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item prop="devname">
                 <el-select :disabled="butIsDisabled" v-model="item.devname" placeholder="请选择病床">
                   <el-option v-for="item in bedsArr" :key="item.F_DictionaryValueId" :label="item.F_Name"
@@ -105,9 +114,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="7">
               <el-form-item prop="num">
-                <el-input-number :disabled="butIsDisabled" v-model="item.num" :min="1" size="medium" />
+                <el-input-number :disabled="butIsDisabled" v-model="item.num" :min="1" size="mini" />
+                <!-- <el-button type="primary" icon="el-icon-close" circle @click="removeItem(index)" /> -->
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item prop="F_IsBorrow">
+                <el-radio-group v-model="item.F_IsBorrow">
+                  <el-radio label="1">借</el-radio>
+                  <el-radio label="2">还</el-radio>
+                </el-radio-group>
                 <el-button type="primary" icon="el-icon-close" circle @click="removeItem(index)" />
               </el-form-item>
             </el-col>
@@ -341,7 +359,8 @@
         },
         devList: [{
           devname: '',
-          num: 1
+          num: 1,
+          F_IsBorrow:''
         }],
         TagProps: {
           checkStrictly: true,
@@ -433,7 +452,8 @@
         console.log(this.type2Arr[0])
         this.devList = [{
           devname: '',
-          num: 1
+          num: 1,
+          F_IsBorrow: ''
         }]
         if (this.type2Arr.length > 0) {
           this.typeAlias =
@@ -528,7 +548,8 @@
       addItem() {
         const params = {
           devname: '',
-          num: 1
+          num: 1,
+          F_IsBorrow: ''
         }
         this.devList.push(params)
       },
@@ -803,21 +824,36 @@
         var details = []
         let isNull = false
         if (this.typeAlias !== '2004') {
+          var this_ = this
           this.devList.forEach(function(v, n) {
             if (!isNull && !v.devname.split(',')[1]) {
               isNull = true
             }
-            details.push({
-              F_DicId: v.devname.split(',')[1],
-              F_DicName: v.devname.split(',')[0],
-              F_Number: v.num
-            })
+            if(this_.typeAlias === '2001' || this_.typeAlias === '2003'){
+              details.push({
+                F_DicId: v.devname.split(',')[1],
+                F_DicName: v.devname.split(',')[0],
+                F_Number: v.num,
+                F_IsBorrow: v.F_IsBorrow
+              })
+            }else{
+              details.push({
+                F_DicId: v.devname.split(',')[1],
+                F_DicName: v.devname.split(',')[0],
+                F_Number: v.num
+              })
+            }
           })
         }
+        // console.log(details)
+        // return
         if (isNull) {
-          // this.$message.error('请选择对应物资')
-          // return
-          details = []
+          if(this.typeAlias === '2001' || this.typeAlias === '2003'){
+            this.$message.error('请选择对应物资')
+            return
+          }else{
+            details = []
+          }
         }
         if (this.iswomanage == 1 || this.iswomanage == 2) {
           this.ruleForm.DealDept = ''

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

@@ -67,7 +67,10 @@
               </tr>
               <tr v-for="(item, index) in orderDetailData.PSInfo" :key="index">
                 <th>物品名称:</th>
-                <td>{{ item.F_DicName }}</td>
+                <td>{{ item.F_DicName }}
+                  <span v-if="item.F_IsBorrow==1">(借)</span>
+                  <span v-if="item.F_IsBorrow==2">(还)</span>
+                </td>
                 <th>数量:</th>
                 <td>{{ item.F_Number }}</td>
                 <th>-</th>

CallCenterWeb.UI/RMYY/src/views/orderManage/components/askdetail.vue

@@ -18,7 +18,7 @@
               </h1>
             </el-col>
           </el-col>
-          <el-col :span="12" v-if="iscxx">
+          <el-col :span="12" v-if="iscxx == true">
             <el-button type="primary" @click="goView">360视图</el-button>
           </el-col>
           <el-col :md="24" class="order_detail_content">
@@ -320,6 +320,7 @@ export default {
       userid: window.localStorage.getItem("storageUsercode"),
       zjh: "",
       iscxx: false,
+      xqdepts: this.$store.getters.serverConfig.View_Depts,
       dialogVisible: false,
       activeName: "1",
       ChatList: [], // 备注详情列表
@@ -384,7 +385,7 @@ export default {
   created() {
     this.getDetail("0");
     this.getDetail("1");
-    if (window.localStorage.getItem("deptId") == 4) {
+    if(this.xqdepts.indexOf(window.localStorage.getItem("deptId")) >= 0)  {
       this.iscxx = true;
     }
   },

CallCenterWeb.UI/RMYY/src/views/scheduleManagement/scheduleInfo/components/addAutoCleanGroup.vue

@@ -0,0 +1,86 @@
+<template>
+  <div v-loading="loading">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="130px">
+      <el-form-item label="时间范围" prop="workTime">
+        <el-date-picker v-model="ruleForm.workTime" class="date_picker" type="daterange" range-separator="至"
+          start-placeholder="开始时间" end-placeholder="结束时间" value-format="yyyy-MM-dd">
+          align="left"
+          unlink-panels />
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">保存</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+  import {
+    getDelClass
+  } from '@/api/commonAPI'
+  export default {
+    name: 'AddAutoCleanGroup',
+    components: {
+
+    },
+    props: {
+      layerid: {
+        type: String,
+        default: ''
+      }
+    },
+    data() {
+      return {
+        ruleForm: {
+          workTime: '', // 时间范围
+        },
+        rules: {
+          workTime: {
+            required: true,
+            message: '请选择时间范围',
+            trigger: 'change'
+          },
+        },
+      }
+    },
+    created() {
+
+    },
+    methods: {
+      submitForm() {
+        this.$refs.ruleForm.validate((valid) => {
+          if (valid) {
+            return new Promise((resolve) => {
+              const params = {
+                starttime: this.ruleForm.workTime && this.ruleForm.workTime[0], // 开始时间
+                endtime: this.ruleForm.workTime && this.ruleForm.workTime[1], // 结束时间
+              }
+              getDelClass(params).then((response) => {
+                this.$parent.$layer.close(this.layerid)
+                this.$parent.getBeOnDuty(this.stime, this.etime)
+                this.$parent.getBeOnDuty(this.nextstime, this.nextetime)
+                this.$parent.getBeOnDuty(this.laststime, this.lastetime)
+                this.$message({
+                  message: '操作成功',
+                  type: 'success'
+                })
+              })
+              resolve()
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .date_picker {
+    width: 100%;
+  }
+
+  div.date_picker input.el-range-input {
+    width: 46%;
+  }
+</style>

CallCenterWeb.UI/RMYY/src/views/scheduleManagement/scheduleInfo/index.vue

@@ -4,6 +4,7 @@
     <el-row style="margin-bottom: 20px;">
       <el-button type="primary" class="filter-item" icon="el-icon-plus" style="float:right;" @click="btn_add">智能排班
       </el-button>
+      <el-button type="primary" class="filter-item" @click="btn_clean">一键清空</el-button>
     </el-row>
     <el-row>
       <FullCalendar ref="myCalendar" :options="calendarOptions" @eventDrop="calendarEventDrop" />
@@ -26,6 +27,7 @@
   import listPlugin from '@fullcalendar/list'
   import addGroupClass from './components/addGroupClass'
   import addAutoGroupClass from './components/addAutoGroupClass'
+  import addAutoCleanGroup from './components/addAutoCleanGroup.vue'
   import {
     getNowDate,
     getFirstDayInCurrentMonth,
@@ -96,6 +98,19 @@
       eventMouseover(info) {
         console.log(info)
       },
+      btn_clean(){
+        this.$layer.iframe({
+          content: {
+            content: addAutoCleanGroup, // 传递的组件对象
+            parent: this, // 当前的vue对象
+            data: {
+              
+            } // props//该方法会自动添加一个key为layerid的值， 该值为创建层的id， 可以直接使用
+          },
+          area: ['40%', '55%'],
+          title: '清空排班信息'
+        })
+      },
       btn_add() {
         this.$layer.iframe({
           content: {

CallCenterWeb.UI/RMYY/static/config/serverConfig.json

@@ -6,6 +6,7 @@
   "CORP_ID":"dingbb1314af9ad8e421f2c783f7214b6d69",
   "SOCKET_IP": "192.168.8.7",
   "SOCKET_PORT": "8081",
+  "View_Depts": "[4]",
   "PAGESIZES": "[10, 20, 50, 100]",
   "PAGESIZE": "10",
   "monitorPlatformTime": "5000",

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

@@ -28,7 +28,7 @@
 						<uni-icons type="plus" size="30" color="#007aff" @click="plusClck()"></uni-icons>
 						<uni-icons type="minus" size="30" color="#007aff" @click="minusClck()"></uni-icons>
 					</view>
-					<view style="width: 100%;height: 50px;" v-for="(item, index) in dicList">
+					<view style="width: 100%;height: 80px;" v-for="(item, index) in dicList">
 						<view class="dicSelect" v-if="identification==='JC' || identification==='FJ'">
 							<uni-data-picker class="uni_item" placeholder="请选择标本信息" :localdata="dataOrderType" @nodeclick="(e)=>nodeclickMuter(e,index)">
 							</uni-data-picker>
@@ -40,6 +40,9 @@
 						<view class="dicNum">
 							<uni-number-box v-model="item.F_Number" />
 						</view>
+						<view style="display: block;width: 100%;text-align: center;" v-if="identification === '2001' || identification === '2003'">
+							<uni-data-checkbox v-model="item.F_IsBorrow" :localdata="F_IsBorrowTypesList" />
+						</view>
 					</view>
 				</view>
 				<!-- <uni-forms-item label="送达地点" required name="ToPlace">
@@ -121,6 +124,13 @@
 					opt: 2,
 					EmergencyTypes: '',
 				},
+				F_IsBorrowTypesList:[{
+					text: '借',
+					value: '1'
+				},{
+					text: '还',
+					value: '2'
+				}],				
 				EmergencyTypesList: [{
 					text: '一般',
 					value: '一般'
@@ -169,7 +179,8 @@
 				dicList: [{
 					F_DicId: 0,
 					F_DicName: '',
-					F_Number: 1
+					F_Number: 1,
+					F_IsBorrow: ''
 				}],
 				// 校验规则
 				rules: {
@@ -404,6 +415,17 @@
 			},
 			// 工单提交
 			submit(ref) {
+				// console.log(this.dicList)
+				// return
+				if(this.identification === '2001' || this.identification === '2003'){
+					if(!this.dicList[0].F_DicName){
+						this.$mHelper.toast('请选择物资信息')
+						return
+					}
+				}
+				if(!this.dicList[0].F_DicName){
+					this.dicList = null
+				}
 				this.imgIdList = []
 				this.disabledButton = true
 				this.fileLists.forEach(v =>{

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

@@ -79,6 +79,8 @@
 					<div v-for="item in detailContentData.PSInfo">
 						<span v-if="$mHelper.findParents(orderTypeList,detailContentData.F_WorkOrderCategory).indexOf('标本')>=0">{{$mHelper.findParents(orderTypeBBXXList,item.F_DicId) + '（'+ item.F_Number + '）'}}</span>
 						<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-else></span>
 						
 					</div>