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

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

@@ -168,7 +168,7 @@ export default {
        watchKey:false,
        inputKey:"",
        dict_add:false,
-       data: '同意'
+       data: ''
     }
   },
   filters: { //定义过滤器
@@ -183,14 +183,11 @@ export default {
   created(){
     setTimeout(()=> {
         this.data = this.value ? this.value : '同意'
-    },100)
-
-
+    },500)
   },
   watch: {
     data:{
         handler(){
-
           this.$emit('input', this.data)
         },
         immediate: true

src/views/platform/bo/boDef/list.vue

@@ -249,7 +249,6 @@ export default {
     getFormatParams() {
       const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
       params['Q^TYPE_ID_^S'] = this.typeId
-      console.log(params)
       return ActionUtils.formatParams(
         params,
         this.pagination,

src/views/platform/data/dataset/list.vue

@@ -102,7 +102,8 @@ export default {
           forms: [
             { prop: 'Q^NAME_^SL', label: '名称', labelWidth: 80, itemWidth: 200 },
             { prop: 'Q^KEY_^SL', label: '业务主键', labelWidth: 80, itemWidth: 200 },
-            { prop: 'Q^TYPE_^SL', label: '类型', fieldType: 'select', options: datasetTypeOptions, labelWidth: 80, itemWidth: 200 }
+            { prop: 'Q^TYPE_^SL', label: '类型', fieldType: 'select', options: datasetTypeOptions, labelWidth: 80, itemWidth: 200 },
+            { prop: 'Q^FROM_^SL', label: '来源', labelWidth: 80, itemWidth: 200 }
           ]
         },
         // 表格字段配置

src/views/system/jbdHome/yangPinShuJu/index.vue

@@ -69,8 +69,10 @@
             <!-- <div class="Type" ><entrustType/></div> -->
           </div>
           <div class="detection">
-            <div class="monthlyS" ref="MonthlyStatus_refs"><monthlyStatus  :NowTime1="NowTime1"/></div>
-            <div class="annualS" ref="AnnualStatus_refs"><annualStatus :NowTime1="NowTime1"/></div>
+            <!-- <div class="monthlyS" ref="MonthlyStatus_refs"><monthlyStatus  :NowTime1="NowTime1"/></div> -->
+            <div class="monthlyS" ref="MonthlyStatus_refs"><sampleReceived  :NowTime1="NowTime1"/></div>
+            <!-- <div class="annualS" ref="AnnualStatus_refs"><annualStatus :NowTime1="NowTime1"/></div> -->
+            <div class="annualS" ref="AnnualStatus_refs"><waitingInspection :NowTime1="NowTime1"/></div>
             <div class="monthlyN" ref="MonthlyNumber_refs"><monthlyNumber  :NowTime1="NowTime1"/></div>
           </div>
         </div>
@@ -96,6 +98,11 @@ import monthlyStatus from './MonthlyStatus'
 import annualStatus from './AnnualStatus'
 //月度检测情况组件
 import monthlyNumber from './MonthlyNumber'
+//待收样样品列表
+import sampleReceived from './sampleReceived'
+//检样品列表
+import waitingInspection from './waitingInspection'
+
 export default {
 
   components:{
@@ -105,7 +112,9 @@ export default {
     entrustType,
     monthlyStatus,
     annualStatus,
-    monthlyNumber
+    monthlyNumber,
+    sampleReceived,
+    waitingInspection
   },
   data(){
     return{
@@ -122,8 +131,6 @@ export default {
     this.getNowTime()
   },
   created() {
-    //时间
-    // this.currentTime()
     if(screenfull.isEnabled && !screenfull.isFullscreen){
      this.allView()
       
@@ -152,28 +159,17 @@ export default {
         month: nowDate.getMonth() + 1,
       }
       this.NowTime1 = date.year + '-' + date.month
-      // console.log('页面第一次进来显示时间',date.year,date.month)
-      //进来获取当前时间 之后获取当前月份天数 传给
-      // console.log('页面显示的时间',this.NowTime1+"-01")  //2022-11
-      //把页面第一次进来的 当前年度月份 传给该方法处理 得到day及days
-      // this.getDaysInMonth(date.year,date.month)
-      
+
+      console.log(this.NowTime1)
     },
     changeTime1(e){
-      // console.log('改变时间',e) //2022-07
-      // debugger
+
       let year = e.slice(0,4)
       let month = e.slice(5,7)
       this.NowTime1 = year + '-' + month
-      // this.$set(this.data_key[index], "key", value);
-      // console.log('用户操作之后 页面显示的时间',this.NowTime,year,month) //2022-11 2022 11
-      //把年度月份传给getDaysInMonth()之前，先清理上一次数据
-      // this.entrustNumber.diswpose()  //这个方法干嘛的？？ 为啥清不掉entrustNumberInit()方法的数据
+  
       this.days=[]
-      //在这里打印一下this.days数组
-      // console.log('用户操作了时间控件之后打印this.days数组',this.days)
-      //把用户操作时间控件改变的时间 的年度月份 传给该方法处理 得到day及days
-      // this.getDaysInMonth(year,month)
+
     },
     // getDaysInMonth(year,month){
     //   let temp = new Date(year,month,0);
@@ -255,20 +251,21 @@ export default {
           justify-content:space-between;
           // border: 1px solid rgb(142, 190, 30);
           .monthlyS{
-            width: 23%;
+            width: 31%;
             height: 100%;
             // background-color: rgb(12, 103, 131);
           }
           .monthlyN{
             flex: 3;
-            width: 50%;
+            width: 34%;
             height: 100%;
             margin: 0px 10px;
             // background-color: rgb(171, 163, 204);
           }
           .annualS{
-            width: 23%;
+            width: 31%;
             height: 100%;
+            margin-left: 10px;
             // background-color: rgb(12, 103, 131);
           }
         

src/views/system/jbdHome/yangPinShuJu/sampleReceived.vue

@@ -0,0 +1,57 @@
+<template>
+    <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" >
+        <div class="middleFontC">待收样样品列表</div>
+        <dv-scroll-board style="height: calc(100% - 50px);"
+          v-if="tableData.data && tableData.data.length"
+          :config="tableData"
+        />
+    </dv-border-box-7>
+</template>
+<script>
+import curdPost from '@/business/platform/form/utils/custom/joinCURD.js'
+
+    export default {
+        data () {
+            return {
+                tableData:{
+                    header: ['样品编号', '样品名称', '委托单号','委托单位','委托时间'],
+                    data: [
+                        // ['行1列1', '行1列2', '行1列3', '行1列3', '行1列3'],
+                        // ['行2列1', '行2列2', '行2列3', '行2列3', '行2列3']
+                    ]
+                }
+            }
+        },
+        mounted(){
+            this.getYangPin()
+        },
+        methods:{
+            getYangPin(){
+                this.tableData.data.length = 0
+                let sql = "select * from t_lhypb where jie_yang_zhuang_t = '待接收'"
+                curdPost('sql',sql).then(res=>{
+                    let arr = res.variables.data
+                    for (var i = 0; i < arr.length; i++) {
+                        let changeArr = [arr[i].yang_pin_bian_hao,arr[i].yang_pin_ming_che,arr[i].wei_tuo_dan_hao_,arr[i].wei_tuo_dan_wei_,arr[i].wei_tuo_ri_qi_]
+                        console.log(changeArr,this.tableData.data,'arrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr')
+                        this.tableData.data.push(changeArr)
+                    }
+                })
+            }
+        }
+    }
+</script>
+<style>
+.allcss{
+    width: 100%;
+}
+.middleFontC{
+    font-size: 120%;
+    font-weight: 600;
+    text-align: center;
+    height: 50px;
+    display: flex;
+	align-items: center;
+    justify-content: center;
+}
+</style>

src/views/system/jbdHome/yangPinShuJu/waitingInspection.vue

@@ -0,0 +1,57 @@
+<template>
+    <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" >
+        <div class="middleFontC">待检样品列表</div>
+        <dv-scroll-board style="height: calc(100% - 50px);"
+          v-if="tableData.data && tableData.data.length"
+          :config="tableData"
+        />
+    </dv-border-box-7>
+</template>
+<script>
+import curdPost from '@/business/platform/form/utils/custom/joinCURD.js'
+
+    export default {
+        data () {
+            return {
+                tableData:{
+                    header: ['样品编号', '样品名称', '委托单号','委托单位','委托时间'],
+                    data: [
+                        // ['行1列1', '行1列2', '行1列3', '行1列3', '行1列3'],
+                        // ['行2列1', '行2列2', '行2列3', '行2列3', '行2列3']
+                    ]
+                }
+            }
+        },
+        mounted(){
+            this.getYangPin()
+        },
+        methods:{
+            getYangPin(){
+                this.tableData.data.length = 0
+                let sql = "select t_lhypdjb.*,t_lhwtzsb.wei_tuo_ri_qi_ from t_lhypdjb LEFT JOIN t_lhwtzsb on t_lhypdjb.wei_tuo_dan_hao_ = t_lhwtzsb.wei_tuo_bian_hao_ where t_lhypdjb.liu_zhuan_zhuang_ = '待检'"
+                curdPost('sql',sql).then(res=>{
+                    let arr = res.variables.data
+                    for (var i = 0; i < arr.length; i++) {
+                        let changeArr = [arr[i].yang_ben_bian_hao,arr[i].yang_ben_ming_che,arr[i].wei_tuo_dan_hao_,arr[i].wei_tuo_dan_wei_,arr[i].wei_tuo_ri_qi_]
+                        console.log(changeArr,this.tableData.data,'arrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr')
+                        this.tableData.data.push(changeArr)
+                    }
+                })
+            }
+        }
+    }
+</script>
+<style>
+.allcss{
+    width: 100%;
+}
+.middleFontC{
+    font-size: 120%;
+    font-weight: 600;
+    text-align: center;
+    height: 50px;
+    display: flex;
+	align-items: center;
+    justify-content: center;
+}
+</style>