Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

src/business/platform/bpmn/components/approval-opinion/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-     <!-- 
+     <!--
     <div v-if="enableCommon">
      <template v-if="!disabled && commonStatments && commonStatments.length>0">
         <el-dropdown
@@ -45,10 +45,10 @@
         :key="i"
         :type="shortcut.type"
         @click="handleShortcut(shortcut)"
-      >{{ shortcut.label }}</el-link> 
+      >{{ shortcut.label }}</el-link>
     </div>
         -->
-        
+
    <el-dropdown  style="width: 100%;" size="mini"
     	   @click.native="reqPhrase($store.getters.userInfo.employee.groupID,elFormItem)"
     	   placement="top-start"
@@ -168,6 +168,7 @@ export default {
        watchKey:false,
        inputKey:"",
        dict_add:false,
+       data: '同意'
     }
   },
   filters: { //定义过滤器
@@ -179,18 +180,13 @@ export default {
       return value
     }
   },
-  computed: {
-    data: {
-      get() {
-        // 默认填充同意
-        return this.value ? this.value : '同意'
-      },
-      set(val) {
-        this.$emit('input', val)
-      }
-    }
+  created(){
+    this.data = this.value ? this.value : '同意'
   },
   watch: {
+    data(){
+      this.$emit('input', this.data)
+    },
     value: {
       handler(val, oldVal) {
         if (!valueEquals(val, oldVal)) {

src/business/platform/bpmn/form/index.vue

@@ -91,7 +91,7 @@
             :action="actionName"
             :title="actionTitle"
             :task-id="taskId"
-            :hide-opinion="isBpmOpinionHide"
+            :hide-opinion="false"
             :form-opinion="submitFormOpinion"
             @close="visible => (rejectDialogVisible = visible)"
             @action-event="handleActionEvent"

src/components/ibps-tree/index.vue

@@ -210,6 +210,11 @@ export default {
   computed: {
     treeData() {
       if (!this.data || this.data.length === 0) return []
+      this.data.map(item => {
+        if (item.name === '任务分类') {
+            item.name = '事务分类'
+        }
+      })
       if (this.dataType === 'list') {
         return TreeUtils.transformToTreeFormat(JSON.parse(JSON.stringify(this.data)), {
           idKey: this.treeOptions['node-key'],

src/views/platform/bpmn/bpmInstHis/list.vue

@@ -4,7 +4,7 @@
             <ibps-type-tree
                 :width="width"
                 :height="height"
-                title="记录分类"
+                title="事务分类"
                 :location="location"
                 category-key="FLOW_TYPE"
                 :hasPermission="hasPermission"

src/views/platform/bpmn/bpmInstHis/record/component/testingRecord.vue

@@ -168,12 +168,6 @@
             path: '43罗湖/LHXBJY-QP-7.1-01-FQ-05 检测委托单.rpx',
             hasItem: false
         },
-        {
-            name: '检测报告',
-            key: 'id_',
-            path: '43罗湖/LH非 检测报告.rpx',
-            hasItem: false
-        },
         // {
         //     name: '检测报告审批表',
         //     key: 'id_',
@@ -191,6 +185,12 @@
             key: 'file',
             path: '',
             hasItem: true
+        },
+        {
+            name: '检测报告',
+            key: 'id_',
+            path: '43罗湖/LH非 检测报告.rpx',
+            hasItem: false
         }
     ]
     // 非通用检测项目编号及报表路径

src/views/platform/org/employee/edit/basic-info.vue

@@ -45,6 +45,10 @@
             {{ formData.isSuper|optionsFilter(isSuperOptions,'label') }}
           </el-tag>
         </el-form-item>
+        <el-form-item label="单位名称">
+          <el-input v-if="!readonly" v-model="formData.qq" />
+          <span v-else>{{ formData.qq }}</span>
+        </el-form-item>
         <el-form-item label="员工姓名" prop="name">
           <el-input v-if="!readonly" v-model="formData.name" />
           <span v-else>{{ formData.name }}</span>
@@ -83,10 +87,10 @@
           <el-input v-if="!readonly" v-model="formData.mobile" />
           <span v-else>{{ formData.mobile }}</span>
         </el-form-item>
-        <el-form-item label="QQ">
+        <!-- <el-form-item label="QQ">
           <el-input v-if="!readonly" v-model="formData.qq" />
           <span v-else>{{ formData.qq }}</span>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
     </el-col>
   </el-row>

src/views/platform/org/employee/list.vue

@@ -125,7 +125,7 @@ export default {
           { prop: 'account', label: this.$t('platform.org.employee.prop.account'),width:150},
           //{ prop: 'wcAccount', label: this.$t('platform.org.employee.prop.wcAccount'),width:120},
           { prop: 'orgName', label: this.$t('platform.org.employee.prop.orgPath'), sortable: false ,width:250},
-          { prop: 'wcAccount', label: '客户单位名称',width:250},
+          { prop: 'qq', label: '客户单位名称',width:250},
           { prop: 'status', label: this.$t('platform.org.employee.prop.status'), tags: statusOptions,width:100},
           { prop: 'createTime', label: this.$t('common.field.createTime')},
         ],

src/views/system/jbdHome/board/component/CarouselTabl.vue

@@ -1,8 +1,8 @@
 <template>
-  <div style="width: 100%;height: 100%;">
-    <div class="title" style="vertical-align: top; height: 35px;font-size: 18px;">停用/报废列表</div>
-    <div style="width:100%;display: inline-block;background-color: #06163f;">
-      <dv-scroll-board :config="info" style="width:100%;height:320px" />
+  <div style="width: 100%;height: 100%;overflow: hidden;">
+    <div class="title" style="vertical-align: top; height: 10%;font-size: 16px;">{{ title }}</div>
+    <div style="width:100%;height: 90%;display: inline-block;background-color: #06163f;">
+      <dv-scroll-board :config="info" style="width:100%;height:100%" />
     </div>
   </div>
 </template>
@@ -17,6 +17,10 @@ export default {
       type: Object,
       default: {},
     },
+    title: {
+      type: String,
+      default: "",
+    },
   },
 };
 </script>

src/views/system/jbdHome/board/component/equipmentBoardTopcard.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="top-bar">
+  <div id="top-bar" style="width:100%;height:100%">
     <div class="content">
       <!-- <div class="title">设备信息情况</div> -->
       <div class="bar">
@@ -7,7 +7,11 @@
           <div v-for="(v, i) in item.children" :key="i" class="box1" >
             <div class="label" style="text-align: center; ">{{ v.label }}</div>
             <div class="count" style="display: flex;justify-content: center;">
-              <div :style="{color:v.data.style.fill}" style="font-weight:bold;font-size: 27px;">{{v.value}}</div>
+              <div v-if=" v.label.includes('计划')||v.label.includes('申请')" :style="{color:'#9966FF'}" style="font-weight:bold;font-size: 27px;">{{v.value}}</div>
+              <div v-else-if="v.label.includes('报废/停用')" :style="{color:'#FF0066'}" style="font-weight:bold;font-size: 27px;">{{v.value}}</div>
+              <div v-else-if="v.label.includes('受限')" :style="{color:'#CCFF33'}" style="font-weight:bold;font-size: 27px;">{{v.value}}</div>
+              <div v-else-if="v.label.includes('已')||v.label.includes('完成')||v.label.includes('正常')||v.label.includes('率')" :style="{color:'#00b56a'}" style="font-weight:bold;font-size: 27px;">{{v.value}}</div>
+              <div v-else :style="{color:'#66CCCC'}" style="font-weight:bold;font-size: 27px;">{{v.value}}</div>
               <div class="unit" style="line-height: 34px;">{{ v.unit }}</div>
             </div>
           </div>  
@@ -72,7 +76,7 @@ export default {
           i.data = {
             number: [i.value],
             content: "{nt}",
-            toFixed: i.danwei == "%" ? 2 : 0,
+            toFixed: 1,
             textAlign: "center",
             style: {
               fill: this.fontColor[this.getRandom(0, 11)],
@@ -91,8 +95,9 @@ export default {
 
 <style lang="scss" scoped>
 .content{
-  height: 82%;
+  height: 100%;
   width: 100%;
+  min-height: 0px
   // background-color: rgba(6, 30, 93, 0.5);
   // .title{
   //   // width: 100%;
@@ -104,7 +109,7 @@ export default {
   position: relative;
   margin: 20px 2%;
   width: 96%;
-  height: 150px;
+  height: 100%;
   display: flex;
   justify-content: space-between;
   align-items: center;

src/views/system/jbdHome/board/component/getPieView.vue

@@ -52,6 +52,9 @@ export default {
           trigger: 'item',
           formatter: '{d}%'
         },
+        label: {
+          formatter: '{b}\n({d}%)'
+        },
         legend: {
           show: true,
           z: 3,

src/views/system/jbdHome/board/component/zhuzhuangtu.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="pieView">
-    <div style="height: 30px;line-height: 30px;text-align: left;padding-left: 10px;width: 100%;">{{info.config.title}}</div>   
-    <div style="width:100%;height:320px;display: inline-block;">
-      <div :id="info.config.idSelector" style="width:100%;height:320px;"> </div>
+    <div style="height: 10%;line-height: 30px;text-align: left;padding-left: 10px;width: 100%;">{{info.config.title}}</div>   
+    <div style="width:100%;height:90%;display: inline-block;overflow: hidden;box-sizing: border-box;">
+      <div :id="info.config.idSelector" style="width:100%;height:100%;"> </div>
     </div>
   </div>
 </template>
@@ -128,6 +128,8 @@ export default {
   display: flex;
   width: 100%;
   height: 100%;
+  box-sizing: border-box;
+  overflow: hidden;
   background-color: rgba(6,30,93,.5);
 }
 </style>

src/views/system/jbdHome/board/equipmentBoard.vue

@@ -15,59 +15,62 @@
           <dv-border-box-8>返回</dv-border-box-8>
         </div>
       </div>
-      <dv-border-box-1>
+      <dv-border-box-1 style="height:88%;overflow: hidden;">
         <!-- 顶部数据 -->
         <div class="topCard">
           <top-bar v-if="topBarData.length" :info="topBarData" />
         </div>
-        <div class="middleCard" >
-          <div style="width:100%;height: 92%;">
-          <div class="middleCardLeft" >
-            <middleCard v-if="MiddleLeftPieViewList.data.length" :info="MiddleLeftPieViewList" ref="middleCardLeft"/>
-          </div>
-          <dv-decoration-2 :reverse="true" style="width:5px;height:350px;margin:0 15px;" />
-          <div class="middleCardCenter">
+        <dv-decoration-10 style="height:2%;display:flex;" />
+
+        <div class="middleCard">
+          <div style="width:100%;height: 100%;box-sizing: border-box;overflow: hidden;">
+            <div class="middleCardLeft">
+              <middleCard v-if="MiddleLeftPieViewList.data.length" :info="MiddleLeftPieViewList" ref="middleCardLeft" />
+            </div>
+            <dv-decoration-2 :reverse="true" style="width:2%;height: 100%;" />
+            <div class="middleCardRight1">
+              <CarouselTabl v-if="MiddleLeftPieViewList.data.length" :info="shiyonglvConfig" title="设备使用记录列表" isup=isup />
+            </div>
+            <!-- <div class="middleCardCenter">
             <middleCard v-if="eBgRateData.data.length" :info="eBgRateData" ref="middleCardCenter"/>
-          </div>
-          <dv-decoration-2 :reverse="true" style="width:5px;height:350px;margin:0 15px;" />
-          <div class="middleCardRight">
-            <CarouselTabl v-if="config.data.length" :info="config"/>
+          </div> -->
+            <dv-decoration-2 :reverse="true" style="width:2%;height:100%;" />
+            <div class="middleCardRight">
+              <CarouselTabl v-if="config.data.length" :info="config" title="设备报废列表" />
+            </div>
           </div>
         </div>
-        </div>
-        <dv-decoration-10 />
+        <dv-decoration-10 style="height:2%;display:flex;" />
         <div class="bottomCard">
-          <div style="width:31%;display:flex;">
+          <div style="width:32%;height: 100%;overflow: hidden;box-sizing: border-box;display:flex;">
             <div class="bottomCardLeft0">
-              <middleCard v-if="weiHuSheBeiData.data.length" :info="weiHuSheBeiData" ref="sheBeiWeiHuRef"/>
+              <middleCard v-if="weiHuSheBeiData.data.length" :info="weiHuSheBeiData" ref="sheBeiWeiHuRef" />
             </div>
-            <dv-decoration-2 :reverse="true" style="width:3%;height:330px;margin: 0 10px;" />
-            <div style="width:37%">
+            <!-- <dv-decoration-2 :reverse="true" style="width:3%;height:100%;;margin: 0 10px;" /> -->
+            <!-- <div style="width:37%">
               <zhuzhuangtu v-if="sheBeiweiHuData.data.length" :info="sheBeiweiHuData"  ref="sheBeiWeiHuDataref"/>          
+            </div> -->
+          </div>
+          <dv-decoration-2 :reverse="true" style="width:1%;height:100%;overflow: hidden;box-sizing: border-box;" />
+          <div style="width:34%;display:flex;">
+            <!-- <div style="width:40%">
+              <zhuzhuangtu v-if="zhuantaiEData.data.length" :info="zhuantaiEData" ref="zhuantaiEDataref" />
+            </div> -->
+            <!-- <dv-decoration-2 :reverse="true" style="width:3%;height:100%;" /> -->
+            <div class="bottomCardright">
+              <middleCard v-if="jianDingjiaoZhunSheBeiData.data.length" :info="jianDingjiaoZhunSheBeiData" ref="jiandingRef" />
             </div>
           </div>
-          <dv-decoration-2 :reverse="true" style="width:5px;height:330px;margin: 0 10px;" />
-          <div style="width:31%;display:flex;">
+          <dv-decoration-2 :reverse="true" style="width:1%;height:100%;overflow: hidden;box-sizing: border-box;" />
+          <div style="width:32%;overflow: hidden;box-sizing: border-box;display:flex;">
             <div class="bottomCardLeft">
               <middleCard v-if="sheBeiHeChaData.data.length" :info="sheBeiHeChaData" ref="sheBeiHeChaRef"/>
             </div>
-            <dv-decoration-2 :reverse="true" style="width:5px;height:330px;margin: 0 10px;" />
-            <div style="width:37%">
-              <zhuzhuangtu v-if="bottomData.data.length" :info="bottomData"  ref="bottomCardLeft"/>          
-            </div>
+            <!-- <dv-decoration-2 :reverse="true" style="width:5px;height:330px;margin: 0 10px;" /> -->
+            <!-- <div style="width:100%">
+              <zhuzhuangtu v-if="bottomData.data.length" :info="bottomData" ref="bottomCardLeft" />
+            </div> -->
           </div>
-          <dv-decoration-2 :reverse="true" style="width:5px;height:330px;margin: 0 10px;" />
-          <div style="width:31%;display:flex;">
-            <div class="bottomCardright">
-              <middleCard v-if="jianDingjiaoZhunSheBeiData.data.length" :info="jianDingjiaoZhunSheBeiData" ref="jiandingRef"/>
-            </div>
-            <dv-decoration-2 :reverse="true" style="width:3%;height:330px;margin: 0 10px;" />
-            <div style="width:40%">
-              <zhuzhuangtu v-if="zhuantaiEData.data.length" :info="zhuantaiEData"  ref="zhuantaiEDataref"/>
-            </div>
-          </div>
-
-          
 
         </div>
       </dv-border-box-1>
@@ -77,17 +80,17 @@
 <script>
 import screenfull from "screenfull";
 import curdPost from "@/business/platform/form/utils/custom/joinCURD.js";
-import { color } from 'echarts/lib/export';
+import { color } from "echarts/lib/export";
 // import { config } from 'public/lib/UEditor/third-party/zeroclipboard/ZeroClipboard';
 // import { acceptList } from "./data.js";
 // import { number } from 'echarts/lib/export';
 export default {
   name: "checkBoard",
   components: {
-    topBar: () => import('./component/equipmentBoardTopcard'),
-    middleCard: () => import('./component/getPieView'),
-    zhuzhuangtu: () => import('./component/zhuzhuangtu'),
-    CarouselTabl: () => import('./component/CarouselTabl')
+    topBar: () => import("./component/equipmentBoardTopcard"),
+    middleCard: () => import("./component/getPieView"),
+    zhuzhuangtu: () => import("./component/zhuzhuangtu"),
+    CarouselTabl: () => import("./component/CarouselTabl"),
   },
   data() {
     const d = new Date();
@@ -98,16 +101,22 @@ export default {
       today: d.toJSON().slice(0, 10),
       topBarData: [],
       timer: null,
-      MiddleLeftPieViewList:{},
-      eBgRateData:{},
-      sheBeiHeChaData:{},
-      jianDingjiaoZhunSheBeiData:{},
-      weiHuSheBeiData:{},
-      bottomData:{},
-      zhuantaiEData:{},
-      sheBeiweiHuData:{},
-      config:{},
-      zichan:0,
+      MiddleLeftPieViewList: {},
+      eBgRateData: {},
+      sheBeiHeChaData: {},
+      jianDingjiaoZhunSheBeiData: {},
+      weiHuSheBeiData: {},
+      shiyonglvConfig: {
+        header: ["设备名称","使用人", "使用时间","存放位置", "状态", "频率"],
+        data: [],
+        columnWidth: ["130", "90","110","120", "100", "70"],
+        rowNum: 6,
+      },
+      bottomData: {},
+      zhuantaiEData: {},
+      sheBeiweiHuData: {},
+      config: {},
+      zichan: 0,
     };
   },
   created() {
@@ -122,7 +131,8 @@ export default {
     }
   },
   methods: {
-    allView() { // 默认显示全屏 
+    allView() {
+      // 默认显示全屏
       screenfull.request();
     },
     goBack() {
@@ -130,23 +140,33 @@ export default {
     },
     updateAll(e) {
       // this.getSheBeiMony();
+      this.getCarouselShiYonglvTable();
       this.getTopBarData();
       this.getMiddleLeftPieView();
       this.getCarouselTable();
       // this.getbottomData();
     },
-    async getTopBarData(){
+    async getTopBarData() {
       let this_ = this;
-      
-      this.MiddleLeftPieViewList={  data:[],  config:{idSelector:"main"}, color:[]};
-      this.eBgRateData = { data:[],config:{}};
-      this.sheBeiHeChaData = { data:[], config:{}};
-      this.jianDingjiaoZhunSheBeiData = { data:[],  config:{}};
-      this.weiHuSheBeiData = {data:[],config:{}};
-      this.bottomData = {xData:[],data:[],config:{idSelector:""}};
-      this.zhuantaiEData = {xData:[],data:[],config:{idSelector:""}};
-      this.sheBeiweiHuData ={xData:[],data:[],config:{idSelector:""}};
-      let sql =`select a.Equipments,a1.mony,b.addEquipments,c.testEquipments,c1.testNoEquipments,d.checkEquipments,
+
+      this.MiddleLeftPieViewList = {
+        data: [],
+        config: { idSelector: "main" },
+        rowNum: 6,
+        color: [],
+      };
+      this.eBgRateData = { data: [], config: {} };
+      this.sheBeiHeChaData = { data: [], config: {} };
+      this.jianDingjiaoZhunSheBeiData = { data: [], config: {} };
+      this.weiHuSheBeiData = { data: [], config: {} };
+      this.bottomData = { xData: [], data: [], config: { idSelector: "" } };
+      this.zhuantaiEData = { xData: [], data: [], config: { idSelector: "" } };
+      this.sheBeiweiHuData = {
+        xData: [],
+        data: [],
+        config: { idSelector: "" },
+      };
+      let sql = `select a.Equipments,a1.mony,b.addEquipments,c.testEquipments,c1.testNoEquipments,d.checkEquipments,
       d1.checkNoEquipments,e.goodEquipments,f.scrapEquipments,g.limitedEquipments,h.weiHuNoEquipments,h1.weiHuEquipments
       from  
       (select count(*) as Equipments from t_sbdj) as a,
@@ -161,228 +181,309 @@ export default {
       (select count(*) as limitedEquipments  from t_sbdj where she_bei_zhuang_ta ='限制使用' or she_bei_zhuang_ta ='备用') as g,
       (select count(*) as weiHuNoEquipments  from t_mjsbwhjhzb where create_time_ LIKE '${this_.month}') as h,
       (select count(*) as weiHuEquipments  from t_mjsbwhbyjlby where create_time_ LIKE '${this_.month}' and shi_fou_guo_shen_ ='1') as h1`;
-     await curdPost("sql",sql).then(res=>{
-        const data = res.variables.data
-        let zichan = this_.getAllMonyInt(data);
-        let eIntactnessRate = Number((((data[0].goodEquipments/data[0].Equipments).toFixed(4))*100+"").slice(0,5));
-        let eBadRate =Number((( (100 - eIntactnessRate).toFixed(4))+"").slice(0,4));
-        let obj ={};
-        obj.value = Number(((data[0].goodEquipments/data[0].Equipments).toFixed(4)*100+"").slice(0,5));
-        obj.name = "正常设备";
-        this_.MiddleLeftPieViewList.data.push(obj);
-        obj ={};
-        obj.value =Number(((data[0].limitedEquipments/data[0].Equipments).toFixed(4)*100+"").slice(0,5));
-        obj.name = "备用设备";
-        this_.MiddleLeftPieViewList.data.push(obj);
-        obj ={};
-        obj.value = Number(((data[0].scrapEquipments/data[0].Equipments).toFixed(4)*100+"").slice(0,5));
-        obj.name = "停用/报废";
-        this_.MiddleLeftPieViewList.data.push(obj);
-        this_.MiddleLeftPieViewList.color = ['#339933','#FFFF66','#FF0033'];
-        this_.MiddleLeftPieViewList.config.title = "设备工作状态分布";
-        this_.MiddleLeftPieViewList.config.idSelector = "main2";
-        this_.$nextTick(()=>{
-        setTimeout(() => {
-					this_.$refs.middleCardLeft.getMiddleLeft()// hhhh xxxx
-				}, 1000)
-        })
-        obj ={};
-        let result =[
-        {
-          title: '',
-          children: [
-            {
-              label: '设备总数',
-              value: data[0].Equipments,
-              danwei:'台'
-            },
-            {
-              label: '新增设备',
-              value: data[0].addEquipments,
-              danwei:'台'
-            },
-            {
-              label: '正常设备',
-              value: data[0].goodEquipments,
-              danwei:'台'
-            },            
-            {
-              label: '报废/停用设备',
-              value: data[0].scrapEquipments,
-              danwei:'台'
-            },
-            {
-              label: '受限设备',
-              value: data[0].limitedEquipments,
-              danwei:'台'
-            }
-          ]
-        },
-        {
-          title: '',
-          children: [
-            {
-              label: '计划维护设备',
-              value: data[0].weiHuNoEquipments,
-              danwei:'台'
-            },
-            {
-              label: '已维护设备',
-              value: data[0].weiHuEquipments,
-              danwei:'台'
-            }
-          ]
-        },
-        {
-          title: '',
-          children: [
+      await curdPost("sql", sql)
+        .then((res) => {
+          const data = res.variables.data;
+          let zichan = this_.getAllMonyInt(data);
+          zichan = zichan +''
+          zichan =zichan.substring(0,zichan.length-4)
+          let eIntactnessRate = Number(
+            (
+              (data[0].goodEquipments / data[0].Equipments).toFixed(2) * 100 +
+              ""
+            ).slice(0, 5)
+          );
+          let eBadRate = Number(
+            ((100 - eIntactnessRate).toFixed(4) + "").slice(0, 4)
+          );
+          let obj = {};
+          obj.value = Number(
+            (
+              (data[0].goodEquipments / data[0].Equipments).toFixed(4) * 100 +
+              ""
+            ).slice(0, 5)
+          );
+          obj.name = "正常设备数";
+          this_.MiddleLeftPieViewList.data.push(obj);
+          obj = {};
+          obj.value = Number(
+            (
+              (data[0].limitedEquipments / data[0].Equipments).toFixed(4) *
+                100 +
+              ""
+            ).slice(0, 5)
+          );
+          obj.name = "受限设备数";
+          this_.MiddleLeftPieViewList.data.push(obj);
+          obj = {};
+          obj.value = Number(
+            (
+              (data[0].scrapEquipments / data[0].Equipments).toFixed(4) * 100 +
+              ""
+            ).slice(0, 5)
+          );
+          obj.name = "停用/报废";
+          this_.MiddleLeftPieViewList.data.push(obj);
+          this_.MiddleLeftPieViewList.color = ["#339933", "#FFFF66", "#FF0033"];
+          this_.MiddleLeftPieViewList.config.title = "设备工作状态情况";
+          this_.MiddleLeftPieViewList.config.idSelector = "main2";
+          this_.$nextTick(() => {
+            // setTimeout(() => {
+            // this_.$refs.middleCardLeft.getMiddleLeft(); // hhhh xxxx
+            // }, 1000)
+          });
+          obj = {};
+          let result = [
             {
-              label: '计划检定/校准设备',
-              value: data[0].testNoEquipments,
-              danwei:'台'
+              title: "",
+              children: [
+                {
+                  label: "设备总数",
+                  value: data[0].Equipments,
+                  danwei: "",
+                },
+                {
+                  label: "新增数",
+                  value: data[0].addEquipments,
+                  danwei: "",
+                },
+                {
+                  label: "正常数",
+                  value: data[0].goodEquipments,
+                  danwei: "",
+                },
+
+                {
+                  label: "受限数",
+                  value: data[0].limitedEquipments,
+                  danwei: "",
+                },
+                {
+                  label: "报废/停用数",
+                  value: data[0].scrapEquipments,
+                  danwei: "",
+                },
+              ],
             },
             {
-              label: '已检定/校准设备',
-              value: data[0].testEquipments,
-              danwei:'台'
-            }
-          ]
-        },
-        {
-          title: '',
-          children: [
-            {
-              label: '计划核查设备',
-              value: data[0].checkNoEquipments,
-              danwei:'台'
+              title: "",
+              children: [
+                {
+                  label: "计划维护数",
+                  value: data[0].weiHuNoEquipments,
+                  danwei: "",
+                },
+                {
+                  label: "已维护数",
+                  value: data[0].weiHuEquipments,
+                  danwei: "",
+                },
+              ],
             },
             {
-              label: '本月已核查设备',
-              value: data[0].checkEquipments,
-              danwei:'台'
-            }
-          ]
-        },
-        {
-          title: '',
-          children: [
-            {
-              label: '设备完好率',
-              value: eIntactnessRate,
-              danwei:'%'
+              title: "",
+              children: [
+                {
+                  label: "计划检定/校准数",
+                  value: data[0].testNoEquipments,
+                  danwei: "",
+                },
+                {
+                  label: "已检定/校准数",
+                  value: data[0].testEquipments,
+                  danwei: "",
+                },
+              ],
             },
             {
-              label: '设备故障率',
-              value: eBadRate,
-              danwei:'%'
+              title: "",
+              children: [
+                {
+                  label: "本月计划核查数",
+                  value: data[0].checkNoEquipments,
+                  danwei: "",
+                },
+                {
+                  label: "本月已核查数",
+                  value: data[0].checkEquipments,
+                  danwei: "",
+                },
+              ],
             },
             {
-              label: '设备总值',
-              value:zichan,
-              danwei:'元'
+              title: "",
+              children: [
+                {
+                  label: "完好率",
+                  value: eIntactnessRate,
+                  danwei: "%",
+                },
+                {
+                  label: "故障率",
+                  value: eBadRate,
+                  danwei: "%",
+                },
+                {
+                  label: "总值(万元)",
+                  value: zichan,
+                  danwei: "",
+                },
+              ],
             },
-          ]
-        }
-       ];
-       //
-      this_.bottomData.xData =["计划核查设备","已核查设备"];
-      this_.bottomData.data.push(data[0].checkNoEquipments);
-      this_.bottomData.data.push(data[0].checkEquipments);
-      this_.bottomData.config.title ="核查设备柱状图";
-      this_.bottomData.config.idSelector ="main4";
-      // this_.$nextTick(()=>{
-      //   setTimeout(() => {
-					
-			// 	}, 1000)
-      // })
-      this_.zhuantaiEData.xData =["计划检定/校准设备","已完成检定/校准设备",];
-      this_.zhuantaiEData.data.push(data[0].testNoEquipments);
-      this_.zhuantaiEData.data.push(data[0].testEquipments);
-      this_.zhuantaiEData.config.title ="设备检定/校准设备柱状图";
-      this_.zhuantaiEData.config.idSelector ="main3"; 
-      //维护设备柱状图
-      this_.sheBeiweiHuData.xData =["计划维护设备","已完成设备",];
-      this_.sheBeiweiHuData.data.push(data[0].weiHuNoEquipments);
-      this_.sheBeiweiHuData.data.push(data[0].weiHuEquipments);
-      this_.sheBeiweiHuData.config.title ="设备维护柱状图";
-      this_.sheBeiweiHuData.config.idSelector ="mainWeiHuZ";
-      this_.$nextTick(()=>{
-        setTimeout(() => {
-          this_.$refs.zhuantaiEDataref.getMiddleLeft()// hhhh xxxx
-					this_.$refs.bottomCardLeft.getMiddleLeft()// hhhh xxxx
-          this_.$refs.sheBeiWeiHuDataref.getMiddleLeft();
-				}, 1000)
-      })
-      
-      let objRate = {};
-      objRate.name ="设备完好率";
-      objRate.value = eIntactnessRate;
-      this_.eBgRateData.data.push(objRate);
-      objRate ={};
-      objRate.value = eBadRate;
-      objRate.name = "设备故障率";
-      this_.eBgRateData.data.push(objRate);
-      this_.eBgRateData.color = ['#339933','#FF0033'];
-      this_.eBgRateData.config.title = "设备工作状态分布";
-      this_.eBgRateData.config.idSelector = "main1";
-      //设备维护
-      let objweihu ={};
-      objweihu.name ="计划维护设备";
-      objweihu.value = data[0].weiHuNoEquipments;
-      this_.weiHuSheBeiData.data.push(objweihu);
-      objweihu ={};
-      objweihu.value =  data[0].weiHuEquipments;
-      objweihu.name = "已维护设备";
-      this_.weiHuSheBeiData.data.push(objweihu);
-      this_.weiHuSheBeiData.color = ['#5470c6','#38a838'];
-      this_.weiHuSheBeiData.config.title = "设备维护分布";
-      this_.weiHuSheBeiData.config.idSelector = "mainWeiHu";
-      //设备核查
-      let objHeCha ={};
-      objHeCha.name ="计划核查设备";
-      objHeCha.value = data[0].checkNoEquipments;
-      this_.sheBeiHeChaData.data.push(objHeCha);
-      objHeCha ={};
-      objHeCha.value =  data[0].checkEquipments;
-      objHeCha.name = "已核查设备";
-      this_.sheBeiHeChaData.data.push(objHeCha);
-      this_.sheBeiHeChaData.color = ['#5470c6','#38a838'];
-      this_.sheBeiHeChaData.config.title = "设备核查分布";
-      this_.sheBeiHeChaData.config.idSelector = "mainHeCha";
-      //设备检定校准
-      let objJianding ={};
-      objJianding.name ="计划检定/校准设备";
-      objJianding.value = data[0].testNoEquipments;
-      this_.jianDingjiaoZhunSheBeiData.data.push(objJianding);
-      objJianding ={};
-      objJianding.value =  data[0].testEquipments;
-      objJianding.name = "已完成设备";
-      this_.jianDingjiaoZhunSheBeiData.data.push(objJianding);
-      this_.jianDingjiaoZhunSheBeiData.color = ['#5470c6','#38a838'];
-      this_.jianDingjiaoZhunSheBeiData.config.title = "设备检定校准分布";
-      this_.jianDingjiaoZhunSheBeiData.config.idSelector = "mainJianDing";
-      this_.$nextTick(()=>{
-        setTimeout(() => {
-					this_.$refs.middleCardCenter.getMiddleLeft();// hhhh xxxx
-          this_.$refs.sheBeiHeChaRef.getMiddleLeft();//
-          this_.$refs.jiandingRef.getMiddleLeft();
-				}, 1000)
-      })
-      objRate = {};
-      this_.topBarData = result;
-      }).catch(err=>{
-        console.log(err)
-      })
+          ];
+          //
+          this_.bottomData.xData = ["本月计划核查数", "本月已核查数"];
+          this_.bottomData.data.push(data[0].checkNoEquipments);
+          this_.bottomData.data.push(data[0].checkEquipments);
+          this_.bottomData.config.title = "核查设备完成图";
+          this_.bottomData.config.idSelector = "main4";
+          // this_.$nextTick(()=>{
+          //   setTimeout(() => {
+
+          // 	}, 1000)
+          // })
+          this_.zhuantaiEData.xData = [
+            "计划检定/校准数",
+            "已完成检定/校准数",
+          ];
+          this_.zhuantaiEData.data.push(data[0].testNoEquipments);
+          this_.zhuantaiEData.data.push(data[0].testEquipments);
+          this_.zhuantaiEData.config.title = "检定/校准设备完成图";
+          this_.zhuantaiEData.config.idSelector = "main3";
+          //维护设备数柱状图
+          this_.sheBeiweiHuData.xData = ["计划维护数", "已完成数"];
+          this_.sheBeiweiHuData.data.push(data[0].weiHuNoEquipments);
+          this_.sheBeiweiHuData.data.push(data[0].weiHuEquipments);
+          this_.sheBeiweiHuData.config.title = "设备维护柱状图";
+          this_.sheBeiweiHuData.config.idSelector = "mainWeiHuZ";
+          this_.$nextTick(() => {
+            // setTimeout(() => {
+            // this_.$refs.zhuantaiEDataref.getMiddleLeft(); // hhhh xxxx
+            // this_.$refs.bottomCardLeft.getMiddleLeft(); // hhhh xxxx
+            // this_.$refs.sheBeiWeiHuDataref.getMiddleLeft();
+            // }, 1000)
+          });
+
+          let objRate = {};
+          objRate.name = "完好率";
+          objRate.value =eIntactnessRate;
+          this_.eBgRateData.data.push(objRate);
+          objRate = {};
+          objRate.value =eBadRate;
+          objRate.name = "故障率";
+          this_.eBgRateData.data.push(objRate);
+          this_.eBgRateData.color = ["#339933", "#FF0033"];
+          this_.eBgRateData.config.title = "设备工作状态完成率";
+          this_.eBgRateData.config.idSelector = "main1";
+          //设备数维护
+          let objweihu = {};
+          objweihu.name = "计划维护数";
+          objweihu.value = data[0].weiHuNoEquipments;
+          this_.weiHuSheBeiData.data.push(objweihu);
+          objweihu = {};
+          objweihu.value = data[0].weiHuEquipments;
+          objweihu.name = "已维护数";
+          this_.weiHuSheBeiData.data.push(objweihu);
+          this_.weiHuSheBeiData.color = ["#5470c6", "#38a838"];
+          this_.weiHuSheBeiData.config.title = "设备维护完成率";
+          this_.weiHuSheBeiData.config.idSelector = "mainWeiHu";
+          //设备数核查
+          let objHeCha = {};
+          objHeCha.name = "本月计划核查数";
+          objHeCha.value = data[0].checkNoEquipments;
+          this_.sheBeiHeChaData.data.push(objHeCha);
+          objHeCha = {};
+          objHeCha.value = data[0].checkEquipments;
+          objHeCha.name = "本月已核查数";
+          this_.sheBeiHeChaData.data.push(objHeCha);
+          this_.sheBeiHeChaData.color = ["#5470c6", "#38a838"];
+          this_.sheBeiHeChaData.config.title = "设备核查完成率";
+          this_.sheBeiHeChaData.config.idSelector = "mainHeCha";
+          //设备数检定校准
+          let objJianding = {};
+          objJianding.name = "计划检定/校准数";
+          objJianding.value = data[0].testNoEquipments;
+          this_.jianDingjiaoZhunSheBeiData.data.push(objJianding);
+          objJianding = {};
+          objJianding.value = data[0].testEquipments;
+          objJianding.name = "已完成数";
+          this_.jianDingjiaoZhunSheBeiData.data.push(objJianding);
+          this_.jianDingjiaoZhunSheBeiData.color = ["#5470c6", "#38a838"];
+          this_.jianDingjiaoZhunSheBeiData.config.title = "设备检定/校准完成率";
+          this_.jianDingjiaoZhunSheBeiData.config.idSelector = "mainJianDing";
+          this_.$nextTick(() => {
+            // setTimeout(() => {
+            // this_.$refs.middleCardCenter.getMiddleLeft();// hhhh xxxx
+            // this_.$refs.sheBeiHeChaRef.getMiddleLeft();//
+            // this_.$refs.jiandingRef.getMiddleLeft();
+            // }, 1000)
+          });
+          objRate = {};
+          this_.topBarData = result;
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     },
-    getMiddleLeftPieView(){
+    getMiddleLeftPieView() {
       // [ { value: 1048, name: 'Search Engine' },]
-      console.log()
+      console.log();
     },
-    async getCarouselTable() {
-      this.config={ header:['设备名称','设备编号','规格型号','设备状态'],data:[]};
+    async getCarouselShiYonglvTable() {
+      let this_ = this;
+      // const sql = `select she_bei_ming_chen,she_bei_bian_hao_ ,create_time_,she_bei_zhuang_ku,COUNT(*) AS pinlv FROM t_mjsbsy GROUP BY she_bei_bian_hao_  HAVING create_time_ LIKE '${this.month}%' ORDER BY pinlv DESC`;
+      const sql = `select a.she_bei_ming_chen ,a.create_time_,a.shi_yong_qian_qin,b.name_,c.cun_fang_di_dian_,COUNT(*) AS pinlv FROM  t_yqsbsydjb as a join ibps_party_employee as b on a.shi_yong_ren_ = b.ID_ join t_sbdj as c on a.yi_qi_bian_hao_ = c.id_ GROUP BY create_time_  HAVING create_time_ LIKE '${this.month}%' ORDER BY pinlv DESC`;
+      console.log(sql, "设备使用");
+      let data1 = [];
+      let res1 = [];
+      this_.shiyonglvConfig.data = [];
+      await curdPost("sql", sql)
+        .then((res) => {
+          const result = res.variables.data;
+          result.forEach((item) => {
+            data1 = [];
+            data1.push(item.she_bei_ming_chen);
+            data1.push(item.name_);
+            data1.push(this_.timestampToTime(item.create_time_ / 1000));
+            data1.push(item.cun_fang_di_dian_);
+            // data1.push(item.create_time_);
+            data1.push(item.shi_yong_qian_qin);
+            data1.push(item.pinlv);
+            this_.shiyonglvConfig.data.push(data1);
+            // this_.$forceUpdate()
+          });
 
+          // console.log(this_.shiyonglvConfig.data);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+      this.isup = true;
+    },
+    timestampToTime(timestamp) {
+      var date = new Date(timestamp * 1000);
+      var Y = date.getFullYear() + "-";
+      var M =
+        (date.getMonth() + 1 < 10
+          ? "0" + (date.getMonth() + 1)
+          : date.getMonth() + 1) + "-";
+      var D =
+        (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
+      var h = date.getHours() + ":";
+      var m = date.getMinutes() + ":";
+      var s = date.getSeconds();
+      return Y + M + D;
+    },
+    async getCarouselTable() {
+      this.config = {
+        header: ["设备名称", "编号", "状态"],
+        columnWidth: ["135","125", "50"],
+        rowNum: 6,
+        data: [],
+      };
       let this_ = this;
-      const sql = "select * from t_sbdj where she_bei_zhuang_ta ='停用' or she_bei_zhuang_ta ='报废' or she_bei_zhuang_ta ='报废/停用'";
+      const sql =
+        "select * from t_sbdj where she_bei_zhuang_ta ='停用' or she_bei_zhuang_ta ='报废' or she_bei_zhuang_ta ='报废/停用'";
       let data1 = [];
       await curdPost("sql", sql)
         .then((res) => {
@@ -391,7 +492,7 @@ export default {
             data1 = [];
             data1.push(item.she_bei_ming_cheng_);
             data1.push(item.she_bei_shi_bie_h);
-            data1.push(item.gui_ge_xing_hao_);
+            // data1.push(item.gui_ge_xing_hao_);
             data1.push(item.she_bei_zhuang_ta);
             this_.config.data.push(data1);
           });
@@ -400,16 +501,15 @@ export default {
           console.log(err);
         });
     },
-    getAllMonyInt (monyArr){
+    getAllMonyInt(monyArr) {
       let mony = 0;
-      let filterMony
-      monyArr.forEach(item=>{
-        if(item.mony.includes("元")){
-           filterMony = item.mony.slice(0,item.mony.length-1)*1;
-           mony +=filterMony
+      let filterMony;
+      monyArr.forEach((item) => {
+        if (item.mony.includes("元")) {
+          filterMony = item.mony.slice(0, item.mony.length - 1) * 1;
+          mony += filterMony;
         }
-
-      })
+      });
       // console.log(mony.toFixed(2))
       // return mony.toFixed(2);
       return mony;
@@ -436,43 +536,43 @@ export default {
   position: absolute;
   color: #fff;
   z-index: 999;
-    #dv-full-screen-container {
-      background-image: url("./img/bg.png");
-      background-size: 100% 100%;
-      box-shadow: 0 0 3px blue;
-      display: flex;
-      flex-direction: column;
-    }
-    .main-content {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-    }
+  #dv-full-screen-container {
+    background-image: url("./img/bg.png");
+    background-size: 100% 100%;
+    box-shadow: 0 0 3px blue;
+    display: flex;
+    flex-direction: column;
+  }
+  .main-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .block-left-right-content {
+    flex: 1;
+    display: flex;
+    margin-top: 0.8%;
+  }
+  .block-top-bottom-content {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    padding-left: 0.8%;
+  }
+  .block-top-content {
+    height: 55%;
+    display: flex;
+    flex-grow: 0;
+    box-sizing: border-box;
+    padding-bottom: 0.8%;
+  }
 
-    .block-left-right-content {
-      flex: 1;
-      display: flex;
-      margin-top: 0.8%;
-    }
-    .block-top-bottom-content {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      box-sizing: border-box;
-      padding-left: 0.8%;
-    }
-    .block-top-content {
-      height: 55%;
-      display: flex;
-      flex-grow: 0;
-      box-sizing: border-box;
-      padding-bottom: 0.8%;
-    }
-  
   .header {
     position: relative;
     width: 100%;
-    height: 9%;
+    height: 10%;
     display: flex;
     justify-content: space-between;
     flex-shrink: 0;
@@ -517,73 +617,81 @@ export default {
     .back {
       left: 75%;
     }
-  }  
-  .topCard{
+  }
+  .topCard {
     width: 100%;
-    height: 20%;
+    height: 18%;
     box-sizing: border-box;
     overflow: hidden;
   }
- .bottomCard{
-  height: 37%;
-  overflow: hidden;
-  box-sizing: border-box;
+  .bottomCard {
+    height: 36%;
+    overflow: hidden;
+    box-sizing: border-box;
   }
-  .middleCard{
-    height:40%;
+  .middleCard {
+    height: 38%;
     overflow: hidden;
     box-sizing: border-box;
   }
-  .middleCard,.bottomCard{
-    width: 100%;
+  .middleCard,
+  .bottomCard {
+    width: 96%;
     margin-left: 30px;
     // margin-top: 30px;
-    div{
-      display: inline-block;                                                        
+    div {
+      display: inline-block;
     }
-    .middleCardLeft{
-      width: 25%;
+    .middleCardLeft {
+      width: 26%;
       height: 100%;
+      box-sizing: border-box;
+      overflow: hidden;
     }
-    .middleCardCenter{
-      width: 25%;
+    // .middleCardCenter{
+    //   width: 25%;
+    //   height: 100%;
+    //   box-sizing: border-box;
+    //   overflow: hidden;
+    // }
+    .middleCardRight {
+      width: 26%;
       height: 100%;
+      box-sizing: border-box;
+      overflow: hidden;
     }
-    .middleCardRight{
-      width: 43%;
+    .middleCardRight1 {
+      width: 44%;
       height: 100%;
+      box-sizing: border-box;
+      overflow: hidden;
     }
-    // .middleCardRight1{
-    //   width: 45%;
-    // }
     padding: 2px;
   }
-  .bottomCard{
+  .bottomCard {
     display: flex;
-    div{
+    div {
       display: inline-block;
     }
-    .bottomCardLeft0,.bottomCardLeft,.bottomCardright{
-      width: 70%;
+    .bottomCardLeft0,
+    .bottomCardLeft {
+      height: 100%;
+      overflow: hidden;
+      box-sizing: border-box;
+      width: 100%;
+    }
+    .bottomCardLeft {
+      height: 100%;
+      overflow: hidden;
+      box-sizing: border-box;
+      width: 100%;
+    }
+    .bottomCardright {
+      height: 100%;
+      overflow: hidden;
+      box-sizing: border-box;
+      width: 100%;
     }
-    // .bottomCardCenter0{
-
-    // }
-    // .bottomCardLeft{
-
-    //   margin-left: 30px;
-    // }
-    // .bottomCardCenter{
-    //   margin-left: 15px;
-    // }
-    // .bottomCardright{
-
-    //   margin-left: 15px;
-    // }
-    // .bottomCardright2{
-
-    //   margin-left: 15px;
-    // }
   }
 }
 .dv-decoration-10 {

src/views/system/jbdScan/goods/manualConfirmation.vue

@@ -61,7 +61,7 @@
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
-                            <el-form-item label="本次确认数量">
+                            <el-form-item label="本次确认数量"  required>
                               <el-input v-model="item.jie_yang_shu_lian"></el-input>
                             </el-form-item>
                           </el-col>
@@ -226,14 +226,18 @@
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
-                            <el-form-item label="留样数量">
+                            <el-form-item label="留样数量" required>
                              <template slot-scope="scope">
-                                <el-input-number
+                              <el-input 
+                                v-model="item.liu_yang_shu_lian"
+                                >
+                              </el-input>
+                                <!-- <el-input-number
                                  v-model="item.liu_yang_shu_lian"
                                   controls-position="right"
                                   @change="handleChange"
                                   :min="1" :max="9999">
-                                 </el-input-number>
+                                 </el-input-number> -->
                              </template>
                             </el-form-item>
                           </el-col>

src/views/system/jbdScan/goods/sampleConfirmation.vue

@@ -60,7 +60,7 @@
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
-                            <el-form-item label="本次确认数量">
+                            <el-form-item label="本次确认数量"  required>
                               <el-input v-model="item.jie_yang_shu_lian"></el-input>
                             </el-form-item>
                           </el-col>
@@ -225,14 +225,17 @@
                             </el-form-item>
                           </el-col>
                           <el-col :span="6">
-                            <el-form-item label="留样数量">
+                            <el-form-item label="留样数量"  required>
                              <template slot-scope="scope">
-                                <el-input-number
+                              <el-input 
+                                v-model="item.liu_yang_shu_lian">
+                              </el-input>
+                                <!-- <el-input-number
                                  v-model="item.liu_yang_shu_lian"
                                   controls-position="right"
                                   @change="handleChange"
                                   :min="1" :max="9999">
-                                 </el-input-number>
+                                 </el-input-number> -->
                              </template>
                             </el-form-item>
                           </el-col>

src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -29,6 +29,7 @@ export default {
             temp[i].biao_zhi_uuid_ = this.uuid()
             temp[i].shi_fou_liu_yang_ = '是'
             temp[i].yan_shou_jie_guo_ = '完好'
+            temp[i].liu_yang_shu_lian = ' ml/支×1支'
             temp[i].liu_yang_ri_qi_ = this.dateFormat()
             temp[i].liu_yang_qi_xian = dayjs(temp[i].song_jian_shi_jia).add(3,'month').format("YYYY-MM-DD")
             temp[i].xiao_hui_ri_qi_ = dayjs(temp[i].liu_yang_qi_xian).endOf('month').format("YYYY-MM-DD")
@@ -55,6 +56,7 @@ export default {
             res.variables.data[i].biao_zhi_uuid_ = this.uuid()
             res.variables.data[i].shi_fou_liu_yang_ = '是'
             res.variables.data[i].yan_shou_jie_guo_ = '完好'
+            res.variables.data[i].liu_yang_shu_lian = ' ml/支×1支'
             res.variables.data[i].liu_yang_ri_qi_ = this.dateFormat()
             res.variables.data[i].liu_yang_qi_xian = dayjs(res.variables.data[i].song_jian_shi_jia).add(3,'month').format("YYYY-MM-DD")
             res.variables.data[i].xiao_hui_ri_qi_ = dayjs(res.variables.data[i].liu_yang_qi_xian).endOf('month').format("YYYY-MM-DD")
@@ -196,10 +198,10 @@ export default {
                 this_.$message.error("留样时必须填写留样数量!")
                 return;
               }
-              if (ypInfoList[yp].liu_yang_shu_lian > ypInfoList[yp].yang_pin_zong_shu) {
-                this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 留样数量不得大于收样数量。')
-                return;
-              }
+              // if (ypInfoList[yp].liu_yang_shu_lian > ypInfoList[yp].yang_pin_zong_shu) {
+              //   this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 留样数量不得大于收样数量。')
+              //   return;
+              // }
               if (ypInfoList[yp].liu_yang_qi_xian == null || ypInfoList[yp].liu_yang_qi_xian == '') {
                 this_.$message.error("留样时必须填写留样期限!")
                 return;
@@ -433,6 +435,7 @@ export default {
                          rw["zhan_shi_biao_id_"] = wtdAndYpb[i].zhan_shi_biao_id_   // 展示表id
                          rw["fen_zhuang_liu_ya"] = ypInfoList[i].liu_yang_shu_lian  // 留样数量
                          rw["shi_fou_jia_ji_"] = wtdAndYpb[i].chu_ju_bao_gao_ya // 是否加急【2023/2/23王嘎嘎提出】
+                         rw["yang_pin_shu_lian"] = ypInfoList[i].jie_yang_shu_lian  // 样品确认总数【2023/3/7王嘎嘎提出】
                          rws.push(rw)
                         // }
                   }

src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -33,16 +33,12 @@ export default {
          repostCurd('sql',sql).then(res => {
           if (res.variables.data && res.variables.data.length > 0) {
             for (let i in res.variables.data) {
-              // res.variables.data[i].jie_yang_shu_lian = 1
-              // res.variables.data[i].jie_yang_zhuang_t = '未确认'
-              // res.variables.data[i].biao_zhi_uuid_ = this.uuid()
-              // this.listData.push(res.variables.data[i])
-              // this.OriginalPosition.push(res.variables.data[i].shi_fou_liu_yang_ == "是" ? res.variables.data[i].liu_yang_wei_zhi_ : res.variables.data[i].shou_yang_wei_zhi)
               res.variables.data[i].jie_yang_shu_lian = res.variables.data[i].yang_pin_zong_shu
               res.variables.data[i].jie_yang_zhuang_t = '已确认'
               res.variables.data[i].biao_zhi_uuid_ = this.uuid()
               res.variables.data[i].shi_fou_liu_yang_ = '是'
               res.variables.data[i].yan_shou_jie_guo_ = '完好'
+              res.variables.data[i].liu_yang_shu_lian = ' ml/支×1支'
               res.variables.data[i].liu_yang_ri_qi_ = this.dateFormat()
               res.variables.data[i].liu_yang_qi_xian = dayjs(res.variables.data[i].song_jian_shi_jia).add(3,'month').format("YYYY-MM-DD")
               res.variables.data[i].xiao_hui_ri_qi_ = dayjs(res.variables.data[i].liu_yang_qi_xian).endOf('month').format("YYYY-MM-DD")
@@ -158,10 +154,10 @@ export default {
                   this_.$message.error("留样时必须填写留样数量!")
                   return;
                 }
-                if (ypInfoList[yp].liu_yang_shu_lian > ypInfoList[yp].yang_pin_zong_shu) {
-                  this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 留样数量不得大于收样数量。')
-                  return;
-                }
+                // if (ypInfoList[yp].liu_yang_shu_lian > ypInfoList[yp].yang_pin_zong_shu) {
+                //   this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 留样数量不得大于收样数量。')
+                //   return;
+                // }
                 if (ypInfoList[yp].liu_yang_qi_xian == null || ypInfoList[yp].liu_yang_qi_xian == '') {
                   this_.$message.error("留样时必须填写留样期限!")
                   return;
@@ -372,6 +368,7 @@ export default {
                            rw["zhan_shi_biao_id_"] = wtdAndYpb[i].zhan_shi_biao_id_   // 展示表id
                            rw["fen_zhuang_liu_ya"] = ypInfoList[i].liu_yang_shu_lian  // 留样数量
                            rw["shi_fou_jia_ji_"] = wtdAndYpb[i].chu_ju_bao_gao_ya // 是否加急【2023/2/23王嘎嘎提出】
+                           rw["yang_pin_shu_lian"] = ypInfoList[i].jie_yang_shu_lian  // 样品确认总数【2023/3/7王嘎嘎提出】
                            rws.push(rw)
                           // }
                     }
@@ -467,9 +464,7 @@ export default {
                           repostCurd('add', '{"tableName":"t_ypcfwz","paramWhere":' + JSON.stringify(cfNewList) + '}').then(res => {
                             let selectsql = "select id_ from t_ypcfwz where biao_zhi_uuid_='" + uuid + "'";
                             repostCurd('sql', selectsql).then(res => {
-                              // let dataid = res.variables.data[0].id_;
                               let data = res.variables.data;
-                              // console.log('data:',data)
                               let suchAs = '{"biao_zhi_uuid_":"' + uuid + '"}'
                               // console.log(data.length,changeWeiZhi,changesyWeiZhi,firstIfEmpty,secondIfEmpty)
                               if(data.length == 1 && changeWeiZhi && firstIfEmpty){