.

shanXiPlatform/src/api/grainCheck/index.js

@@ -129,6 +129,16 @@ export function getDateTimeNow(){
   return today
 }
 
+export function getYearWeek(date){
+	var date2=new Date(date.getFullYear(), 0, 1);
+	var day1=date.getDay();
+	if(day1==0) day1=7;
+	var day2=date2.getDay();
+	if(day2==0) day2=7;
+	var d = Math.round((date.getTime() - date2.getTime()+(day2-day1)*(24*60*60*1000)) / 86400000);
+	return Math.ceil(d /7)+1;
+}
+
 //根据id查询(更多纪录)
 /* export function getAllGrainInfo(params) {
   return request({

shanXiPlatform/src/views/reservesManagement/grainCheck/newGrain/addNewGrain.vue

@@ -244,7 +244,7 @@ import {
   getDateTimeNow,
   haveDone, //处理待办
   haveDone1,
-  getGrainItems
+  getGrainItems,getYearWeek
 } from "@/api/grainCheck/index"
 export default {
   name: "AddNewGrain",
@@ -291,6 +291,8 @@ export default {
       checkPerson: "",
       data2: {}, //待办传参过来的数据
       uid: "",
+      date:new Date(),
+      week:0, //今年的第几周
       // 先自定义后台接收数据的模板然后拼接
       data3: {
         checkTime: "",
@@ -393,9 +395,40 @@ export default {
 
     // 新增初始化数据
     this.getinfo()
+    this.getdate()
   },
 
   methods: {
+
+    getdate() {
+            var myDate = new Date()
+            var year = myDate.getFullYear() //获取完整的年份(4位,1970-????)
+            var mon = myDate.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+            var date = myDate.getDate() //获取当前日(1-31)
+            var week = myDate.getDay() //获取当前星期X(0-6,0代表星期天)
+            let d1 = new Date()
+            let d2 = new Date()
+            d2.setMonth(0)
+            d2.setDate(1)
+            let rq = d1 - d2
+            let s1 = Math.ceil(rq / (24 * 60 * 60 * 1000))
+            let s2 = Math.ceil(s1 / 7)
+            this.week = s2;
+
+            this.datastr =
+                year +
+                "年" +
+                mon +
+                "月" +
+                date +
+                "日" +
+                "\xa0\xa0\xa0" +
+                "第" +
+                s2 +
+                "周"
+        },
+
+
     showHandler(val) {
       // console.log(val, "val...")
       if (val.enumId == 189) {
@@ -696,6 +729,9 @@ export default {
       // this.data3.grainAbnormalDescribe = this.form
       // this.data3.checkTime = getDateTimeNow()
       this.data5.grainConditionRecord.operationTime = getDateTimeNow()
+      this.data5.grainConditionRecord.checkYearWeek = this.week
+
+      // console.log(this.data5.grainConditionRecord.checkYearWeek,'this.data5.grainConditionRecord.checkYearWeek')
       /* this.data5.grainConditionRecord.depotId = this.depot_id
        this.data5.grainConditionRecord.houseId = this.house_id */
       // console.log(this.data3.checkTime,'this.data3.checkTime')

shanXiPlatform/src/views/reservesManagement/grainCheck/newGrain/index.vue

@@ -259,7 +259,7 @@ export default {
           anomalousStatus: 0, //异常状态（0无异常，1有异常）
           checkPerson: null, //检查人
           // checkYear: 0,//检查年份（用于粮情异常等，做年统计）
-          // checkYearWeek: 0,//检查所在年第几周
+          checkYearWeek: 0,//检查所在年第几周
           depotId: null, //库id
           enumId: null, //检查类型
           enumOrder: 0, //用于同公共枚举同步顺序