上线前解决

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

@@ -0,0 +1,18 @@
+import request from "@/utils/request";
+// 获取列表数据
+export function officeWorkReport(params) {
+  return request({
+    url: "FaultRepair/WorkMaintenance",
+    method: "get",
+    params
+  });
+}
+// 话务工作报表导出
+export function officeWorkReportExpt(params) {
+  return request({
+    url: "FaultRepair/WorkMaintenance",
+    method: "get",
+    responseType: "blob",
+    params
+  });
+}

CallCenterWeb.UI/RMYY/src/api/versionUpdate/template.js

@@ -0,0 +1,48 @@
+import request from '@/utils/request'
+
+// 获取列表数据
+export function getList(params) {
+  return request({
+    url: 'Mobiledata/GetList',
+    method: 'get',
+    params
+  })
+}
+
+// 获取数据
+export function getDeatil(id) {
+  return request({
+    url: 'Mobiledata/GetMobiledata',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+// 添加数据
+export function addData(data) {
+  return request({
+    url: 'Mobiledata/AddMobiledata',
+    method: 'post',
+    data
+  })
+}
+// 修改数据
+export function editData(data) {
+  return request({
+    url: 'Mobiledata/AddMobiledata',
+    method: 'post',
+    data
+  })
+}
+// 删除数据
+export function deleteData(nums) {
+  return request({
+    url: 'Mobiledata/DelMobiledata',
+    method: 'post',
+    data: {
+      nums
+    }
+  })
+}

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

@@ -212,7 +212,7 @@
             type="text"
             @click="arriveOrder(scope.row.F_WorkOrderCode)"
           >
-            到达
+            开始
           </el-button>
           <el-button
             v-if="isShowButton(scope.row, 'xiezuo')"
@@ -334,7 +334,9 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogZuzhang = false">取 消</el-button>
-        <el-button type="primary" @click="dialogTransferZuzhang">确 定</el-button>
+        <el-button type="primary" @click="dialogTransferZuzhang"
+          >确 定</el-button
+        >
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogZhiban" title="转值班">
@@ -356,7 +358,9 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogZhiban = false">取 消</el-button>
-        <el-button type="primary" @click="dialogTransferZhiban">确 定</el-button>
+        <el-button type="primary" @click="dialogTransferZhiban"
+          >确 定</el-button
+        >
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogHangUp" title="挂起">
@@ -908,10 +912,7 @@
             <i class="el-icon-plus" />
           </el-upload>
         </el-form-item>
-        <el-form-item
-          label="维修前附件"
-          v-if="doneForm.showBeforePhoto"
-        >
+        <el-form-item label="维修前附件" v-if="doneForm.showBeforePhoto">
           <el-upload
             :headers="headers"
             :file-list="fileList"
@@ -990,16 +991,16 @@ export default {
   },
   data() {
     return {
-      dialogZuzhang:false,
-      dialogZhiban:false,
-      zuzhangForm:{
-        reason:''
+      dialogZuzhang: false,
+      dialogZhiban: false,
+      zuzhangForm: {
+        reason: "",
       },
-      zhibanForm:{
-        reason:''
+      zhibanForm: {
+        reason: "",
       },
-      zhibancode:'',
-      zuzhangcode:'',
+      zhibancode: "",
+      zuzhangcode: "",
       dialogdept: false,
       dialogtongshi: false,
       dialogImageUrl: "",
@@ -1470,15 +1471,15 @@ export default {
       // 完工
       var equiplist = [];
       this.equipmodellist.find((item) => {
-        if(item.F_EquipNumber){
+        if (item.F_EquipNumber) {
           equiplist.push({
             F_DicId: item.F_DicId,
             F_EquipName: item.F_EquipName,
-            F_EquipNumber: item.F_EquipNumber.replace(/\*/,"×"),
+            F_EquipNumber: item.F_EquipNumber.replace(/\*/, "×"),
             F_EquipPrice: item.F_EquipPrice,
             F_EquipAmount: item.F_EquipAmount,
           });
-        }else{
+        } else {
           equiplist.push({
             F_DicId: item.F_DicId,
             F_EquipName: item.F_EquipName,
@@ -1486,7 +1487,7 @@ export default {
             F_EquipPrice: item.F_EquipPrice,
             F_EquipAmount: item.F_EquipAmount,
           });
-        }      
+        }
       });
       if (this.equipmodellist) {
         this.doneForm.equipmodellist = equiplist;
@@ -1495,10 +1496,7 @@ export default {
         if (valid) {
           new Promise((resolve) => {
             console.log(this.doneForm.File, this.doneForm.Picture);
-            if (
-              this.doneForm.showBeforePhoto &&
-              (this.doneForm.Picture === "")
-            ) {
+            if (this.doneForm.showBeforePhoto && this.doneForm.Picture === "") {
               // this.doneForm.File = ''
               this.$message({
                 type: "warning",
@@ -1552,62 +1550,62 @@ export default {
       this.redeploydeptForm.WorkOrderCode = code;
     },
     redeployZuzhang(code) {
-      this.getReason('ZUZHANG')
-      this.dialogZuzhang = true
-      this.zuzhangcode = code
+      this.getReason("ZUZHANG");
+      this.dialogZuzhang = true;
+      this.zuzhangcode = code;
     },
-    dialogTransferZuzhang(){
+    dialogTransferZuzhang() {
       const params = {
-          workordercode: this.zuzhangcode,
-          toUserCode: null,
-          type: "1",
-          reason:this.zuzhangForm.reason
-      }
-      postTransfer(params).then((response)=>{
-        if(response.state === "success"){
+        workordercode: this.zuzhangcode,
+        toUserCode: null,
+        type: "1",
+        reason: this.zuzhangForm.reason,
+      };
+      postTransfer(params).then((response) => {
+        if (response.state === "success") {
           this.$message({
             type: "success",
             message: "操作成功!",
           });
-          this.dialogZuzhang = false
-          this.zuzhangForm.reason = ''
+          this.dialogZuzhang = false;
+          this.zuzhangForm.reason = "";
           this.getListTask();
-        }else {
+        } else {
           this.$message({
             type: "info",
             message: response.message,
           });
         }
-      })
+      });
     },
     redeployZhiban(code) {
-      this.getReason('ZUZHANG')
-      this.dialogZhiban = true
-      this.zhibancode = code
+      this.getReason("ZUZHANG");
+      this.dialogZhiban = true;
+      this.zhibancode = code;
     },
-    dialogTransferZhiban(){
+    dialogTransferZhiban() {
       const params = {
-          workordercode: this.zhibancode,
-          toUserCode: null,
-          type: "2",
-          reason:this.zhibanForm.reason
-      }
-      postTransfer(params).then((response)=>{
-        if(response.state === "success"){
+        workordercode: this.zhibancode,
+        toUserCode: null,
+        type: "2",
+        reason: this.zhibanForm.reason,
+      };
+      postTransfer(params).then((response) => {
+        if (response.state === "success") {
           this.$message({
             type: "success",
             message: "操作成功!",
           });
-          this.dialogZhiban = false
-          this.zhibanForm.reason = ''
+          this.dialogZhiban = false;
+          this.zhibanForm.reason = "";
           this.getListTask();
-        }else {
+        } else {
           this.$message({
             type: "info",
             message: response.message,
           });
         }
-      })
+      });
     },
     postRedeployTongshiOrder() {
       // 转同事

CallCenterWeb.UI/RMYY/src/views/leadConcern/officeWorkReport/cpns/LineChart.vue

@@ -0,0 +1,161 @@
+<template>
+  <div
+    id="gzbx_chart2"
+    :class="className"
+    :style="{ height: height, width: width }"
+  />
+</template>
+<script>
+// import { GetStatisticsTopFiveData } from "@/api/reportCharts/reportCharts";
+// import getdate from "@/utils/getdate";
+export default {
+  props: {
+    className: {
+      type: String,
+      default: "chart",
+    },
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "300px",
+    },
+    chartsTwoValue: {
+      type: String,
+      default: "1",
+    },
+    dataType: {
+      type: String,
+      default: "1",
+    },
+  },
+  watch: {
+    chartsTwoValue: function () {
+      this.statisticsTopFiveReport();
+    },
+    dataType: function () {
+      this.statisticsTopFiveReport();
+    },
+  },
+  data() {
+    return {
+      gzbxData: [],
+      chart: null,
+      echartsData: [],
+      userNameData: [],
+      committedData: [],
+      uncommittedData: [],
+    };
+  },
+  mounted() {
+    // this.statisticsTopFiveReport();
+    this.initChart();
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    getsearchParam(startdata, enddata, users) {
+      this.startdata = startdata;
+      this.enddata = enddata;
+      this.users = users;
+    },
+    statisticsTopFiveReport() {
+      const urlParams = {};
+      GetStatisticsTopFiveData(urlParams).then((response) => {
+        if (response.state.toLowerCase() === "success") {
+          this.userNameData = [];
+          this.committedData = [];
+          this.uncommittedData = [];
+          this.echartsData = [];
+          response.data.forEach((element) => {
+            this.userNameData.push(element.username);
+            this.committedData.push(element.committed);
+            this.uncommittedData.push(element.uncommitted);
+          });
+          if (this.chartsTwoValue === "0") {
+            this.echartsData = this.committedData;
+          } else if (this.chartsTwoValue === "1") {
+            this.echartsData = this.uncommittedData;
+          }
+
+          this.initChart();
+        }
+      });
+    },
+    initChart(arr) {
+      const myChart = this.$echarts.init(
+        document.getElementById("gzbx_chart2")
+      );
+      myChart.setOption({
+        title: {
+          text: "Stacked Line",
+        },
+        tooltip: {
+          trigger: "axis",
+        },
+        legend: {
+          data: ["Email", "Union Ads", "Video Ads", "Direct", "Search Engine"],
+        },
+        grid: {
+          left: "3%",
+          right: "4%",
+          bottom: "3%",
+          containLabel: true,
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: {},
+          },
+        },
+        xAxis: {
+          type: "category",
+          boundaryGap: false,
+          data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"],
+        },
+        yAxis: {
+          type: "value",
+        },
+        series: [
+          {
+            name: "Email",
+            type: "line",
+            stack: "Total",
+            data: [120, 132, 101, 134, 90, 230, 210],
+          },
+          {
+            name: "Union Ads",
+            type: "line",
+            stack: "Total",
+            data: [220, 182, 191, 234, 290, 330, 310],
+          },
+          {
+            name: "Video Ads",
+            type: "line",
+            stack: "Total",
+            data: [150, 232, 201, 154, 190, 330, 410],
+          },
+          {
+            name: "Direct",
+            type: "line",
+            stack: "Total",
+            data: [320, 332, 301, 334, 390, 330, 320],
+          },
+          {
+            name: "Search Engine",
+            type: "line",
+            stack: "Total",
+            data: [820, 932, 901, 934, 1290, 1330, 1320],
+          },
+        ],
+      });
+    },
+  },
+};
+</script>

CallCenterWeb.UI/RMYY/src/views/leadConcern/officeWorkReport/cpns/reportCharts.vue

@@ -0,0 +1,44 @@
+<template>
+  <div>
+    <div>
+      <el-row :gutter="12">
+        <el-col :span="3">
+          <el-card shadow="hover">
+            <div style="display: flex">
+              <div><i class="el-icon-tickets"></i></div>
+              <div style="margin-left: 15px">
+                总量<br />
+                <div style="margin-top: 10px">236</div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </div>
+    <line-chart></line-chart>
+  </div>
+</template>
+<script>
+import LineChart from "./LineChart.vue";
+export default {
+  components: { LineChart },
+  name: "reportCharts",
+  props: {
+    dataType: {
+      type: String,
+      default: "1",
+    },
+  },
+  data() {
+    return {};
+  },
+  watch: {
+    dataType: function () {
+      console.log(this.dataType);
+    },
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+<style lang="scss" scoped></style>

CallCenterWeb.UI/RMYY/src/views/leadConcern/officeWorkReport/cpns/reportList.vue

@@ -0,0 +1,192 @@
+<template>
+  <div>
+    <el-row :gutter="20" />
+
+    <el-table
+      ref="multipleTable"
+      :data="dataLists"
+      border
+      highlight-current-row
+      stripe
+    >
+      <el-table-column
+        prop="username"
+        label="坐席名称"
+        align="center"
+        min-width
+      />
+      <el-table-column prop="count" label="电话总量" align="center" min-width />
+      <el-table-column label="呼入" align="center" min-width>
+        <el-table-column
+          prop="huchucishu"
+          label="总量"
+          align="center"
+          min-width
+        />
+        <el-table-column
+          prop="huruyijieting"
+          label="已接通"
+          align="center"
+          min-width
+        />
+        <el-table-column
+          prop="huruweijieting"
+          label="未接听"
+          align="center"
+          min-width
+        />
+        <el-table-column
+          prop="huruhusunlv"
+          label="呼损率"
+          align="center"
+          min-width
+        />
+        <el-table-column
+          prop="hurujietonglv"
+          label="接通率"
+          align="center"
+          min-width
+        />
+        <el-table-column
+          prop="hurupingjunzhenlingshichang"
+          label="平均振铃时长(秒)"
+          align="center"
+          min-width
+        />
+        <el-table-column
+          prop="hurutonghuashichang"
+          label="通话时长(秒)"
+          align="center"
+          min-width
+        />
+        <el-table-column
+          prop="hurupingjuntonghuashichang"
+          label="平均通话时长(秒)"
+          align="center"
+          min-width
+        />
+      </el-table-column>
+      <el-table-column label="呼出" align="center" min-width>
+        <el-table-column
+          prop="huchucishu"
+          label="总量"
+          align="center"
+          min-width
+        />
+        <el-table-column
+          prop="huchuyijieting"
+          label="已接通"
+          align="center"
+          min-width
+        />
+        <el-table-column
+          prop="huchuweijieting"
+          label="未接通"
+          align="center"
+          min-width
+        />
+        <el-table-column
+          prop="huchujietonglv"
+          label="接通率"
+          align="center"
+          min-width
+        />
+      </el-table-column>
+
+      <el-table-column label="转接" align="center" min-width>
+        <el-table-column
+          prop="zhuanjiecishu"
+          label="总量"
+          align="center"
+          min-width
+        />
+        <el-table-column
+          prop="zhuanyijiejieting"
+          label="已接通"
+          align="center"
+          min-width
+        />
+        <el-table-column
+          prop="zhuanjieweijieting"
+          label="未接通"
+          align="center"
+          min-width
+        />
+        <el-table-column
+          prop="zhaunjiejietonglv"
+          label="接通率"
+          align="center"
+          min-width
+        />
+      </el-table-column>
+    </el-table>
+    <!-- <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex" :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" /> -->
+  </div>
+</template>
+
+<script>
+import Pagination from "@/components/context/Pagination"; // 对el-pagination 二次封装
+import {
+  officeWorkReport,
+  officeWorkReportExpt,
+} from "@/api/leadConcern/leadConcern";
+
+import { getNowDate, getPreDate, exportExcel } from "@/utils";
+export default {
+  name: "TrafficWorkReport",
+  components: {
+    // Pagination
+  },
+  data() {
+    return {
+      fieldListFlag: {},
+      dataLists: [],
+      ruleForm: {
+        startTime: [
+          getPreDate(3600 * 1000 * 24) + " 19:00:00",
+          getNowDate() + " 19:00:00",
+        ],
+        way: "",
+      },
+    };
+  },
+  computed: {},
+  created() {
+    this.getList();
+  },
+  mounted() {},
+  methods: {
+    // 搜索
+    btn_search_task() {
+      this.getList();
+    },
+    getList() {
+      const params = {
+        ststarttimeime: this.ruleForm.startTime && this.ruleForm.startTime[0],
+        endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
+        type: this.ruleForm.way,
+        loweltype: 0,
+      };
+      return new Promise((resolve) => {
+        officeWorkReport(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
+            this.dataLists = response.data;
+          }
+        });
+        resolve();
+      });
+    },
+    btn_export() {
+      const exporParams = {
+        stime: this.ruleForm.startTime && this.ruleForm.startTime[0],
+        endtime: this.ruleForm.startTime && this.ruleForm.startTime[1],
+        groupby: this.ruleForm.way,
+        isdc: 1,
+      };
+      exportExcel(exporParams, officeWorkReportExpt);
+    },
+  },
+};
+</script>
+
+<style scoped></style>

CallCenterWeb.UI/RMYY/src/views/leadConcern/officeWorkReport/index.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="app-container">
+    <el-form :inline="true" :model="ruleForm" class="demo-form-inline">
+      <el-form-item>
+        <el-date-picker
+          v-model="ruleForm.startTime"
+          size="medium"
+          type="datetimerange"
+          format="yyyy-MM-dd HH:mm:ss"
+          :default-time="['19:00:00', '19:00:00']"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+      </el-form-item>
+      <el-form-item label="报工科室">
+        <select-dept-tree :deptparam="deptidArr" @post-deptid="getDeptid" />
+      </el-form-item>
+      <el-form-item label="接收人">
+        <el-select
+          v-model="ruleForm.DealUser"
+          filterable
+          placeholder="请选择接收人"
+          style="width: 100%"
+          @change="changeRepairman1"
+        >
+          <el-option
+            v-for="item in repairman1"
+            :key="item.usercode"
+            :label="item.username + '(' + item.count + ')'"
+            :value="item.username"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="工单类别：">
+        <el-cascader
+          ref="cascader"
+          v-model="orderids"
+          :options="subclassData"
+          :props="defaultProps"
+          size="medium"
+          placeholder="请选择工单类别"
+          filterable
+          clearable
+          @change="handleChange"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="medium" @click="btn_search_task"
+          >查询</el-button
+        >
+        <el-button type="primary" size="medium" @click="btn_export"
+          >导出</el-button
+        >
+      </el-form-item>
+    </el-form>
+    <el-tabs v-model="activeName" @tab-click="handleClick" class="">
+      <el-tab-pane label="趋势图" name="first">
+        <report-charts :dataType="dataType"></report-charts>
+      </el-tab-pane>
+      <el-tab-pane label="表格" name="second">
+        <report-list :dataType="dataType"></report-list>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+<script>
+import { getOrderTypeDrop } from "@/api/systemSetup/roleSetting/menuSetup";
+import { getClassByDeptId } from "@/api/commonAPI";
+import reportCharts from "./cpns/reportCharts";
+import reportList from "./cpns/reportList";
+import { getNowDate, getPreDate } from "@/utils";
+
+export default {
+  name: "authority",
+  components: { reportCharts, reportList },
+  data() {
+    return {
+      // starttime 开始时间 endtime 结束时间  type 类别 loweltype 子类别 deptid 部门id
+      ruleForm: {
+        startTime: [
+          getPreDate(3600 * 1000 * 24) + " 19:00:00",
+          getNowDate() + " 19:00:00",
+        ],
+        ordertype: "",
+        loweltype: "",
+        deptid: "", // 部门id
+        DealUser: "", // 接单人
+      },
+      repairman1: [],
+      orderids: [],
+      defaultProps: {
+        checkStrictly: true,
+        children: "children",
+        label: "text",
+        value: "id",
+      },
+      subclassData: [],
+      deptidArr: [],
+      dataType: "1",
+      activeName: "first",
+    };
+  },
+  created() {
+    this.changeOrder();
+  },
+  methods: {
+    getDeptid(data) {
+      this.ruleForm.deptid = data[data.length - 1];
+      this.getClassUser(this.ruleForm.deptid);
+    },
+    changeRepairman1(data) {
+      console.log(data);
+    },
+    handleChange(data) {
+      if (data.length > 1) {
+        delete this.ruleForm.ordertype;
+        this.ruleForm.loweltype = data[data.length - 1];
+      } else {
+        delete this.ruleForm.loweltype;
+        this.ruleForm.ordertype = data[data.length - 1];
+      }
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+    btn_search_task() {
+      console.log(this.ruleForm);
+    },
+    btn_export() {},
+    getClassUser(id) {
+      const params = {
+        deptid: id,
+      };
+      this.repairman1 = [];
+      this.ruleForm.DealUser = "";
+      if (id) {
+        getClassByDeptId(params).then((res) => {
+          this.repairman1 = res.rows;
+        });
+      }
+    },
+    changeOrder() {
+      const params = {
+        pid: 3000,
+        flag: 1,
+      };
+      return new Promise((resolve) => {
+        getOrderTypeDrop(params).then((response) => {
+          if (response.state.toLowerCase() === "success") {
+            this.subclassData = response.data;
+          }
+        });
+        resolve();
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.reportstatistics {
+  padding: 10px 25px;
+  background: #fff;
+}
+</style>

CallCenterWeb.UI/RMYYAPP/config/index.config.js

@@ -3,8 +3,8 @@ const CONFIG = {
     development: {
         assetsPath: '/static', // 静态资源路径
 				// baseUrl: 'http://192.168.8.10:8033/',
-				baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
-				// baseUrl: 'http://39.164.159.192:8000/', // 本地外网地址s
+				// baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
+				baseUrl: 'http://39.164.159.192:8000/', // 本地外网地址s
 		// baseUrl: 'http://172.16.10.22:8000/',	
         hostUrl: '', // H5地址(前端运行地址)
         weixinAppId: '' // 微信公众号appid

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

@@ -52,7 +52,9 @@
 		0: ["待完成", "已完成"], // 已办待回访
 	}
 	const url = [
-		"Scheduling/MySubmitList",
+		
+		// "Scheduling/MySubmitList",
+		"Scheduling/GetDealManWorkOrderList",
 		"Scheduling/GetDealManWorkOrderList"
 	]
 	export default {

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

@@ -92,6 +92,26 @@
 					<text v-else class="contentText"></text>
 				</view> -->
 			</view>
+			<view class="contentTable">
+				<text class="contentTitle">异常配送信息：</text>
+				<text class="contentText" v-if="!String(this.detailContentData.SDInfo)"></text>
+				<div style="color:#525252;">
+					<div v-for="item in detailContentData.SDInfo">
+						<span v-if="item.F_ToDept&&item.F_ToDept!='0'">送达科室：{{ $mHelper.findParents(departList,item.F_ToDept)}}-</span>
+						<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-if="item.F_PaidInQuantity">(实收数量:{{item.F_PaidInQuantity}})</span>
+						<span v-else></span>
+					</div>
+				</div>
+				
+				<!-- <view class="contentText" style="" v-for="item in detailContentData.PSInfo">
+					<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>

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

@@ -9,23 +9,41 @@
 						<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>
+				<view style="margin: 15px 0;" v-show="isabnormal ==='1'">
+					<view style="margin-bottom: 15px;">
+						<text class="infoTittle"><text style="color: red;">*</text>标本信息</text>
+						<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%;" v-for="(item, index) in dicList">
+						<view style="width: 60%; padding: 15px;">
+							<uni-easyinput v-model="item.F_ReceiveUser" placeholder="请输入接收人" />
+						</view>
+						<view style="display: flex;">
+							<view class="dicSelect" style="width: 60%; padding: 15px;">
+								<uni-data-picker class="uni_item" placeholder="请选择标本信息" :localdata="dataOrderType" @nodeclick="(e)=>nodeclickMuter(e,index)">
+								</uni-data-picker>
+							</view>
+							<view class="dicNum" style=" padding-top: 25px;">
+								<uni-number-box v-model="item.F_Number" />
+							</view>
+						</view>
+						
+						
+					</view>
+				</view>
 				<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>
@@ -61,12 +79,21 @@
 				}],	
 				recipient:'',
 				isabnormal:'0',
+				identification:"JC",
+				dataOrderType:[],
+				dicList: [{
+					F_DicId: 0,
+					F_DicName: '',
+					F_Number: 1,
+					F_ReceiveUser:""
+				}],
 				getFontSizeValue:'1rem',
 				workorderid: '',
 				remark: '',
 				disabledButton: false,
 				File: '',
 				state: 0,
+				dataOrderType:[],
 				imgUrlList: [], // 附件数据
 				imgIdList: [], //上传附件id
 				clickImgState: 0, // 图片回显的状态
@@ -83,8 +110,38 @@
 			this.getGongDanType()
 			this.getGongDanTypeBBXX()
 			this.getPSinfo()
+			
 		},
 		methods: {
+			plusClck() {
+				const params = {
+					F_DicId: 0,
+					F_DicName: '',
+					F_Number: 1
+				}
+				this.dicList.push(params)
+			
+			},
+			minusClck() {
+				this.dicList.splice(this.dicList.length - 1, 1)
+			},
+			nodeclickMuter(e,index){
+				this.dicList[index].F_DicId = e.value
+				this.dicList[index].F_DicName = e.text
+			},
+			getBBxx(){
+				let str
+				console.log(this.identification)
+				if(this.identification == '综合调度/标本转运/急查标本'){
+					str = '急查标本'
+				}
+				if(this.identification == '综合调度/标本转运/非急查标本'){
+					str = '非急查标本'
+				}
+				pageData.getBB(str,(res, data) => {
+					this.dataOrderType = res
+				})
+			},
 			getGongDanType(){
 				let dataOrderType = []
 				const params = {
@@ -117,7 +174,9 @@
 				this.$http.get("Scheduling/GetWorkOrder",params).then((res)=>{
 					if(res.state.toLowerCase() ==="success"){
 						this.F_WorkOrderCategory = res.data[0].F_WorkOrderCategory
+						this.identification = this.$mHelper.findParents(this.orderTypeList,this.F_WorkOrderCategory)
 						this.equipmentCon = res.data[0].PSInfo 
+						this.getBBxx()
 					}
 				})
 			},
@@ -134,14 +193,9 @@
 				  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))
+
+				params.pslist = JSON.parse(JSON.stringify(this.dicList))
+				console.log(params)
 				if(this.$mHelper.findParents(this.orderTypeList,this.F_WorkOrderCategory).indexOf('急查标本')<0){
 					params.pslist = null
 					params.isabnormal = ''
@@ -218,7 +272,7 @@
 					display: inline-block;
 					padding: 10px 0px;
 					color: rgb(102, 102, 102);
-					width: 30%;
+					width: 40%;
 					padding-right: 5px;
 					text-align: center;
 				}

CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/components/vehiccleDetail/vehiccleDetail.vue

@@ -128,6 +128,7 @@
 				departList: [], //部门数据
 				userCodeList: [], //用户信息
 				detailContentData: {}, // 详情内容
+				intaAction:true,
 				orderButtonData: [],
 				departid: '',
 				workOrderButton: [], // 工单按钮权限
@@ -155,6 +156,7 @@
 				this.getDetail(0)
 			} else if (Number(optioin.segmenter) == 1) { //司机里列表
 				this.getDetail(3)
+				
 				this.receiviFlag = optioin.receiviFlag
 				this.listFlag = true
 				this.orderButtonData = []
@@ -216,7 +218,7 @@
 					// alert(response.state)
 					if (response.state.toLowerCase() === "success") {
 						let btnData
-
+						let buttonFacheFlag
 						if (type == 0) {
 							this.detailContentData = response.model
 							this.detailContentData.F_Birth ? this.detailContentData.F_Birth = '是' : this
@@ -249,6 +251,7 @@
 							// let activeFlag = 0
 							this.list1 = []
 							this.workOrderButton = []
+							
 							response.Carlist.forEach((ele) => {
 								// this.active = activeFlag
 								// if (ele.Buttons.length === 0) {
@@ -259,7 +262,20 @@
 								obj.title = ""
 								this.list1.push(obj)
 							})
+							
+							for(let i = 0; i < response.Carlist.length; i++){
+								console.log(response.Carlist[i].Buttons)
+								buttonFacheFlag = i
+							  if(response.Carlist[i].Buttons.length>0) break; // 或continue
+							}
+							if (this.intaAction) {
+								this.active = buttonFacheFlag
+								this.intaAction = false
+							}
+							console.log(this.active,buttonFacheFlag)
 							this.detailContentData = response.Carlist[this.active]
+							
+						
 							btnData = this.detailContentData.Buttons;
 							// console.log(this.orderTypeList, 'this.typeName')
 							// this.typeName = this.$mHelper.findParents(this.orderTypeList, this.detailContentData.F_Type) || '';
@@ -273,18 +289,22 @@
 						// console.log(this.orderTypeList, 'this.typeName')
 						this.typeName = this.$mHelper.findParents(this.orderTypeList, this.detailContentData
 							.F_Type) || '';
-						console.log(this.typeName, 'this.typeName')
-
+						
 						if (btnData.length > 0) {
 							btnData.forEach((element, index) => {
 								let btn = this.$mButtonConfig[element.key];
 								if (btn != undefined) {
-									this.workOrderButton.push(btn);
+									if(this.active ===buttonFacheFlag){
+										this.workOrderButton.push(btn);
+									}else{
+										this.workOrderButton = []
+									}
 								}
 								this.orderButtonData = this.workOrderButton
 							});
+						}else {
+							this.orderButtonData = this.workOrderButton
 						}
-						console.log(this.orderButtonData)
 						pageData.getApplicant(this.detailContentData.F_ProposerDeptId, (res) => {
 							this.userCodeList = res
 						})