Merge remote-tracking branch 'origin/master'

src/components-app/base/dk-app-dropdown-date/dk-app-dropdown-date.vue

@@ -26,15 +26,18 @@
             </div>
           </div>
           <van-tabs :active="active" nav-class="nav-class" color="#00A7B5;">
+            {{dateSearch[0]}}
+            {{dateSearch[1]}}
             <van-tab :title="'从'+format(dateSearch[0])">
-              <van-datetime-picker @change="changeDate" :show-toolbar="false" :data-index="0" type="date"
+
+              <van-datetime-picker @change="changeDate(0,$event)" :show-toolbar="false" :data-index="0" type="date"
                                    :loading="false"
                                    v-model="dateSearch[0]"/>
             </van-tab>
             <van-tab :title="'到' +format(dateSearch[1])">
-              <van-datetime-picker type="date" @change="changeDate" :show-toolbar="false" :data-index="1"
+              <van-datetime-picker type="date" @change="changeDate(1,$event)" :show-toolbar="false" :data-index="1"
                                    :loading="false"
-                                   v-model="dateSearch[1] "/>
+                                   v-model="dateSearch[1]"/>
             </van-tab>
           </van-tabs>
         </van-popup>
@@ -51,11 +54,11 @@ export default {
   name: "dk-app-dropdown-date",
   data() {
     return {
-
-      active: 0,
+      show: false,
+      active: null,
       dateDefault: {},
       dateTypeList: [],
-      dateSearch: [new Date().getTime() + 100, new Date().getTime() + 100],
+      dateSearch: [new Date().getTime()+100, new Date().getTime()+100],
       // 往组件外返回值
       dataDefaultSearch: [],
 
@@ -121,10 +124,7 @@ export default {
     }
   },
   props: {
-    show: {
-      type: Boolean,
-      default: false
-    },
+
     title: {
       type: String,
       default: '跟进时间'
@@ -210,18 +210,18 @@ export default {
           if (item.value + '' === this.defaultValue + '') {
             dateDefault.value = item.value
             dateDefault.text = item.text
-
-            if (item.value + '' === '1') {
+            if (item.value === 1) {
               date = [this.formatTime(new Date()).substring(0, 10), this.formatTime(new Date()).substring(0, 10)]
-            } else if (item.value + '' === '2') {
+            } else if (item.value === 2) {
               date = [this.formatTime(this.getCurrentWeek(0)).substring(0, 10), this.formatTime(this.getCurrentWeek(-6)).substring(0, 10)]
-            } else if (item.value + '' === '3') {
+            } else if (item.value === 3) {
               date = this.getCurrentMonth();
-            } else if (item.value + '' === '6') {
+            } else if (item.value === 6) {
               date = this.timeForMat(7)
-            } else if (item.value + '' === '5') {
+            } else if (item.value === 5) {
               date = this.timeForMat(30)
-            } else if (item.value + '' === '-2') {
+            } else if (item.value == -2) {
+
               date = [this.formatTime(new Date(this.dateSearch[0])).substring(0, 10),
                 this.formatTime(new Date(this.dateSearch[1])).substring(0, 10)]
             }
@@ -230,17 +230,23 @@ export default {
       }
       this.dateTypeList = dateTypeList
       this.dateDefault = dateDefault
+      console.log('date',date)
+      console.log('dateSearch0',new Date(this.dateSearch[0]).getTime())
+      console.log('dateSearch1',new Date(this.dateSearch[1]).getTime())
       this.dataDefaultSearch = date
-      this.dateSearch = [new Date(this.dateSearch[0]).getTime(), new Date(this.dateSearch[1]).getTime()]
+      this.dateSearch = [new Date(this.dateSearch[0]),new Date(this.data.dateSearch[1])]
 
     },
 
     format(time) {
+      if(!time || time == ''){
+        return ''
+      }
       let now = new Date(time);
       let year = now.getFullYear()
       let month = now.getMonth() + 1
       let day = now.getDate()
-      return year + '-' + month + '-' + day
+      return year + "-" + (month < 10 ? "0" + month : month) + "-" + (day < 10 ? "0" + day : day);
     },
     /**
      * 日期变化 查询
@@ -249,6 +255,7 @@ export default {
     choose(item, e) {
       if (item.value === -2) {
         this.show = true
+        console.log('choose',this.dateSearch)
         setTimeout(function () {
           this.active = 0
         }, 100)
@@ -275,6 +282,7 @@ export default {
           date = this.timeForMat(30)
         }
         this.dataDefaultSearch = date
+
         this.$emit('dateCommit', {date: date, dateType: this.dateType, dateDefault: this.dateDefault})
       }
     },
@@ -284,8 +292,9 @@ export default {
      * 日期变化 查询数据
      * @param {*} e
      */
-    changeDate(e) {
-      this.dateSearch[e.currentTarget.dataset.index] = e.detail
+    changeDate(index, e) {
+      console.log('getValues',new Date(e.getValues()).getTime())
+      this.dateSearch[index] = new Date(e.getValues()).getTime()
     },
 
     /**
@@ -318,9 +327,15 @@ export default {
       const hour = date.getHours()
       const minute = date.getMinutes()
       const second = date.getSeconds()
-      return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
 
+      return [year, month, day].map(this.formatNumber).join('-') + ' ' + [hour, minute, second].map(this.formatNumber).join(':')
+
+    },
+     formatNumber(n) {
+      n = n.toString()
+      return n[1] ? n : '0' + n
     },
+
     getCurrentWeek(n) {
       /***参数都是以周一为基准的***/
         //上周的开始时间

src/view-app/mold-management/mold-inventory/index.vue

@@ -9,10 +9,11 @@
     <van-dropdown-menu active-color="#1B365D">
       <!-- 日期 -->
       <van-dropdown-item id="create-time-type" :title="createTimeType.text">
-        <dk-app-dropdown-date id="createTime" dateType="createTime" :blankFlag="false" :defaultValue='createTimeType.value' @dateCommit="dateCommit" ></dk-app-dropdown-date>
+        <dk-app-dropdown-date id="createTime" dateType="createTime" :blankFlag="false"
+                              :defaultValue='createTimeType.value' @dateCommit="dateCommit"></dk-app-dropdown-date>
       </van-dropdown-item>
       <van-dropdown-item id="create-time-type" :title="$t('appStatus')">
-        <dk-app-dropdown-switch :dataList="switchList" ></dk-app-dropdown-switch>
+        <dk-app-dropdown-switch :dataList="switchList"></dk-app-dropdown-switch>
       </van-dropdown-item>
     </van-dropdown-menu>
 
@@ -31,7 +32,7 @@
     <div style="margin: 20px 10px 10px;border-radius: 7px;box-shadow:2px 2px 5px #e5e5e6;">
       <div style="background: #FFFFFF;box-shadow: 0px 5px 10px rgba(225, 229, 238, 0.6);border-radius: 7px;">
         <!--查询结果-->
-        <div style=" padding: 10px 16px 10px 16px;color: #1B365D;font-size: 14px;">{{$t('appQueryResults')}}</div>
+        <div style=" padding: 10px 16px 10px 16px;color: #1B365D;font-size: 14px;">{{ $t('appQueryResults') }}</div>
         <dk-app-table
           :rows="rows"
           :boxShadowFlag="false"
@@ -45,7 +46,6 @@
     </div>
 
 
-
   </div>
 
 </template>
@@ -58,49 +58,116 @@ export default {
   mixins: [appIndexMixin],
   data() {
     return {
+      createTimeSearch: [new Date().getTime() + 100, new Date().getTime() + 100],
       switchList: [
-        { text: '状态1', value: null, checked: false },
-        { text: '状态2', value: null, checked: false },
-        { text: '状态3', value: null, checked: false },
+        {text: '状态1', value: null, checked: false},
+        {text: '状态2', value: null, checked: false},
+        {text: '状态3', value: null, checked: false},
       ],
       createTimeType: {
-        text: '近30天',
-        value: 5
+        text: '本日',
+        value: 1
       },
       rightText: '',
       columns: [],
       showPopup: false,
       rows: [
         {name: 'checkCode', title: this.$t('appCheckCode')}, //
-        {name: 'checkName', title:  this.$t('appCheckName')}, //
+        {name: 'checkName', title: this.$t('appCheckName')}, //
         {name: 'opCreateTime', title: this.$t('appOpCreateTime')}, //
         {name: 'opCreateUserName', title: this.$t('appOpCreateUserName')}, //
         {name: 'remarks', title: this.$t('appRemarks'), fieldFlag: false},
       ],
       tableRowData: [
-        {checkCode:'MIC20230201093504',checkName: '2023年2月盘点', opCreateTime: '2023-02-01 16:29', opCreateUserName:'夏常明',   remarks: '产品类别: 洁具\n' +
+        {
+          checkCode: 'MIC20230201093504',
+          checkName: '2023年2月盘点',
+          opCreateTime: '2023-02-01 16:29',
+          opCreateUserName: '夏常明',
+          remarks: '产品类别: 洁具\n' +
             '产品编码: H01182L, H01182M, H0119L\n' +
-            '模具状态: 在库', checked: false},
+            '模具状态: 在库',
+          checked: false
+        },
 
       ]
     }
   },
   methods: {
+
+    /**
+     *   @desc   : 设置查询参数
+     *   @date   : 2023/02/01
+     *   @author : 于继渤
+     */
+    setSearchParams() {
+      let params = this.searchList
+      if (params === undefined) {
+        params = {}
+      }
+      params.opCreateTimeStart = this.format(this.createTimeSearch[0]) ? this.format(this.createTimeSearch[0]) + ' 00:00:00' : ''// 开始时间
+      params.opCreateTimeEnd = this.format(this.createTimeSearch[1]) ? this.format(this.createTimeSearch[1]) + ' 23:59:59' : '' //结束时间
+      params.ftyId = 1
+      return params
+    },
+    /**
+     *   @desc   : 获取数据
+     *   @date   :  2023/02/01
+     *   @author : 于继渤
+     */
+    getData() {
+      // 参数设置
+      let params = this.setSearchParams()
+      // 查询职位接口
+      this.excute(this.$service.moldingService, this.$service.moldingService.selectMoldingByMouldList, params).then(res => {
+        console.log('获取数据', res)
+        //TODO
+        if (res.code === this.$config.SUCCESS_CODE) {
+
+        }
+      })
+    },
+
+    /**
+     * @desc : 日期组件后的回调
+     * @author : 于继渤
+     * @date : 2022/5/24 12:16
+     */
+    dateCommit(e) {
+      let dateType = e.dateType
+      if (dateType === 'createTime') {
+        let data = e.date
+        this.createTimeSearch = data
+        this.createTimeType = e.dateDefault
+      }
+      this.getData()
+    },
+
+    // 日期格式化
+    format(time) {
+      if (!time || time == '') {
+        return ''
+      }
+      let now = new Date(time);
+      let year = now.getFullYear()
+      let month = now.getMonth() + 1
+      let day = now.getDate()
+      return year + "-" + (month < 10 ? "0" + month : month) + "-" + (day < 10 ? "0" + day : day);
+    },
+
     /**
      * 复选框点击事件
      * @param date
      */
     onClickCheckbox(item) {
     },
-    dateCommit(e){
-        console.log('dateCommit',e)
-    },
+
 
     /**
      * 列表组件点击事件
      * @param date
      */
-    onOpenDetail(item){
+    onOpenDetail(item) {
       this.$router.push({name: 'mold-inventory-detail', params: {item: item}})
     },
     /**

src/view/mst/carr-kiln-car/index.vue

@@ -102,7 +102,7 @@ export default {
         uniqueCode: '',
         carNo: '',
         kilnId:null,
-        kilnCarPlace:[],
+        kilnCarPlace:null,
         displayNo: 0,
         remarks: ''
       },
@@ -171,7 +171,7 @@ export default {
           uniqueCode: '',
           carNo: '',
           kilnId:null,
-          kilnCarPlace:[],
+          kilnCarPlace:null,
           displayNo: 0,
           remarks: ''
       }
@@ -190,7 +190,6 @@ export default {
      *   @author : 常皓宁
      */
     saveData() {
-      console.log('this.params',this.params)
       return this.modalParams.button === this.$config.formMode.add
         ? this.excute(this.$service.carrKilnCarService, this.$service.carrKilnCarService.insert, this.params)
         : this.excute(this.$service.carrKilnCarService, this.$service.carrKilnCarService.update, this.params)