日期调整

3d0db0b7 · 李苏 · d461fb49 · 3d0db0b7 · 3d0db0b7 · 3d0db0b7
Commit 3d0db0b7 authored Jan 05, 2024 by 李苏 💬
21 changed files
--- a/src/views/ccgl/ckgl/ckd/top/index.vue
+++ b/src/views/ccgl/ckgl/ckd/top/index.vue
@@ -108,9 +108,9 @@
 					queryParams: [
 						[{
 								label: '日期',
-								startProp: "llrqb",
-								endProp: "llrqe",
-								span: 12,
+              startProp: "start",
+              endProp: "end",
+								span: 8,
 								type: 'RelDaterangeV2',
 								startValue: new Date().getTime()-1000*60*60*24*30,
 								endValue:new Date().getTime(),

--- a/src/views/ccgl/ckgl/dbckd/top/index.vue
+++ b/src/views/ccgl/ckgl/dbckd/top/index.vue
@@ -125,8 +125,8 @@
            [
              {
                label: '出库日期',
-                startProp: "ywrqb",
-                endProp: "ywrqe",
+                startProp: "start",
+                endProp: "end",
                span: 8,
                type: 'RelDaterangeV2',
                startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,

--- a/src/views/ccgl/ckgl/jhd/top/dbckd.vue
+++ b/src/views/ccgl/ckgl/jhd/top/dbckd.vue
@@ -121,9 +121,9 @@
        	queryParams: [
        		[{
        				label: '日期',
-        				startProp: "llrqb",
-        				endProp: "llrqe",
-        				span: 12,
+        				startProp: "start",
+        				endProp: "end",
+        				span: 8,
        				type: 'RelDaterangeV2',
        				startValue: new Date().getTime()-1000*60*60*24*30,
        				endValue:new Date().getTime(),

--- a/src/views/ccgl/ckgl/jhd/top/index.vue
+++ b/src/views/ccgl/ckgl/jhd/top/index.vue
@@ -98,9 +98,9 @@
 					queryParams: [
 						[{
 								label: '日期',
-								startProp: "llrqb",
-								endProp: "llrqe",
-								span: 12,
+              startProp: "start",
+              endProp: "end",
+								span: 8,
 								type: 'RelDaterangeV2',
 								startValue: new Date().getTime()-1000*60*60*24*30,
 								endValue:new Date().getTime(),

--- a/src/views/ccgl/ckgl/jhd/top/rkd.vue
+++ b/src/views/ccgl/ckgl/jhd/top/rkd.vue
@@ -102,9 +102,9 @@
        	queryParams: [
        		[{
        				label: '日期',
-        				startProp: "llrqb",
-        				endProp: "llrqe",
-        				span: 12,
+              startProp: "start",
+              endProp: "end",
+        				span: 8,
        				type: 'RelDaterangeV2',
        				startValue: new Date().getTime()-1000*60*60*24*30,
        				endValue:new Date().getTime(),

--- a/src/views/ccgl/kngl/bz/top/index.vue
+++ b/src/views/ccgl/kngl/bz/top/index.vue
@@ -127,7 +127,7 @@
              label: '日期',
              startProp: "start",
              endProp: "end",
-              span: 12,
+              span: 8,
              type: 'RelDaterangeV2',
              startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
              endValue: new Date().getTime(),

--- a/src/views/ccgl/kngl/bzzy/top/index.vue
+++ b/src/views/ccgl/kngl/bzzy/top/index.vue
@@ -121,7 +121,7 @@
              label: '日期',
              startProp: "start",
              endProp: "end",
-              span: 12,
+              span: 8,
              type: 'RelDaterangeV2',
              startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
              endValue: new Date().getTime(),

--- a/src/views/ccgl/kngl/zt/top/index.vue
+++ b/src/views/ccgl/kngl/zt/top/index.vue
@@ -105,7 +105,7 @@
                label: '日期',
                startProp: "start",
                endProp: "end",
-                span: 12,
+                span: 8,
                type: 'RelDaterangeV2',
                startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
                endValue: new Date().getTime(),

--- a/src/views/ccgl/rkgl/mpzy/top/edit.vue
+++ b/src/views/ccgl/rkgl/mpzy/top/edit.vue
@@ -256,6 +256,39 @@
            type: 'input',
          },
        ],
+        editColItemList2:[
+          {
+            "label": "状态",
+            "prop": "zt",
+            "span": 8,
+            "type": "RelSelect",
+            "value": "",
+            readonly:true,
+            "typeConfig": {
+            	"src": "wms/rkgl/mpzy/init/zt",
+            	"match": {
+            		"value": "id",
+            		"label": "name"
+            	}
+            }
+          },
+          {
+            label: '维护人',
+            prop: 'whr',
+            type: 'input',
+            span: 8,
+            readonly:true,
+          },
+
+          {
+            label: '维护时间',
+            prop: 'whsj',
+            span: 8,
+            type: 'datetime',
+             readonly:true,
+             value:new Date().getTime()
+          }
+        ],
        /* 从表编辑数据 */
        editTableTitle: [{
            title: "容器编码",

--- a/src/views/ccgl/rkgl/mpzy/top/index.vue
+++ b/src/views/ccgl/rkgl/mpzy/top/index.vue
@@ -165,9 +165,9 @@
            [
              {
                label: '业务日期',
-                startProp: "ywrqb",
-                endProp: "ywrqe",
-                span: 12,
+                startProp: "start",
+                endProp: "end",
+                span: 8,
                type: 'RelDaterangeV2',
                startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
                endValue: new Date().getTime(),

--- a/src/views/ccgl/rkgl/rkd/top/index.vue
+++ b/src/views/ccgl/rkgl/rkd/top/index.vue
@@ -105,7 +105,7 @@
 								label: '日期',
 								startProp: "start",
 								endProp: "end",
-								span: 12,
+								span: 8,
 								type: 'RelDaterangeV2',
 								startValue: new Date().getTime()-1000*60*60*24*30,
 								endValue:new Date().getTime(),

--- a/src/views/ccgl/rkgl/rkdj/edit.vue
+++ b/src/views/ccgl/rkgl/rkdj/edit.vue
@@ -98,21 +98,21 @@
 		data() {
 			return {
        editColItemList2:[
-          {
-            "label": "状态",
-            "prop": "zt",
-            "span": 8,
-            "type": "RelSelect",
-            "value": "",
-            readonly:true,
-            "typeConfig": {
-            	"src": "wms/rkgl/rktz/init/zt",
-            	"match": {
-            		"value": "id",
-            		"label": "name"
-            	}
-            }
-          },
+          // {
+          //   "label": "状态",
+          //   "prop": "zt",
+          //   "span": 8,
+          //   "type": "RelSelect",
+          //   "value": "",
+          //   readonly:true,
+          //   "typeConfig": {
+          //   	"src": "wms/rkgl/rktz/init/zt",
+          //   	"match": {
+          //   		"value": "id",
+          //   		"label": "name"
+          //   	}
+          //   }
+          // },
          {
            label: '维护人',
            prop: 'whr',

--- a/src/views/ccgl/rkgl/rkdj/index.vue
+++ b/src/views/ccgl/rkgl/rkdj/index.vue
@@ -51,9 +51,9 @@
 					queryParams: [
 						[{
 								label: '入库日期',
-								startProp: "ywrqb",
-								endProp: "ywrqe",
-								span: 12,
+              startProp: "start",
+              endProp: "end",
+								span: 8,
 								type: 'RelDaterangeV2',
 								startValue: new Date().getTime()-1000*60*60*24*30,
 								endValue:new Date().getTime(),

--- a/src/views/ccgl/rkgl/sjrw/mxDialog.vue
+++ b/src/views/ccgl/rkgl/sjrw/mxDialog.vue
 <template>
  <DefaultDialog :app='app'>
-    <div slot="form" style="display: flex;">
+    <div slot="form" >
      <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
        <el-row :gutter="20" :app="this" class="editRow">
          <EditColItem :required="item.required||false" :readonly="item.readonly?true:false "

--- a/src/views/ccgl/rkgl/sjrw/sjhz.vue
+++ b/src/views/ccgl/rkgl/sjrw/sjhz.vue
@@ -101,7 +101,7 @@
      },
      sj(){
         this.$refs.basePage.DialogTitle='上架'
-          this.$refs.basePage.DialogWidth='50vw'
+          this.$refs.basePage.DialogWidth='33vw'
        this.$refs.basePage.showDialog=true
      },
      getRow(val) {

--- a/src/views/ccgl/rkgl/sjrw/top/edit.vue
+++ b/src/views/ccgl/rkgl/sjrw/top/edit.vue
@@ -64,6 +64,7 @@
        this.formDetail.splice(0, length)
        list.forEach(item => {
          item.lydjid = item.id
+          item.sjsl=item.yssl
          delete item.id
          this.formDetail.push(_.cloneDeep(item))
        })
@@ -81,6 +82,39 @@
    },
    data() {
      return {
+        editColItemList2:[
+          {
+            "label": "状态",
+            "prop": "zt",
+            "span": 8,
+            "type": "RelSelect",
+            "value": "",
+            readonly:true,
+            "typeConfig": {
+            	"src": "wms/rkgl/sjtz/init/zt",
+            	"match": {
+            		"value": "id",
+            		"label": "name"
+            	}
+            }
+          },
+          {
+            label: '维护人',
+            prop: 'whr',
+            type: 'input',
+            span: 8,
+            readonly:true,
+          },
+
+          {
+            label: '维护时间',
+            prop: 'whsj',
+            span: 8,
+            type: 'datetime',
+             readonly:true,
+             value:new Date().getTime()
+          }
+        ],
        /* dialog*/
        showDialog: false,
        DialogTitle: '选择入库清单',
@@ -207,8 +241,8 @@
                  width: 140
                },
              {
-              	title: "应收数量",
-              	field: "yssl",
+              	title: "上架数量",
+              	field: "sjsl",
                width: 100,
              },
              {

--- a/src/views/ccgl/rkgl/sjrw/top/index.vue
+++ b/src/views/ccgl/rkgl/sjrw/top/index.vue
@@ -37,13 +37,13 @@
 							title: "仓库",
 							field: "ckName",
 							fieldType: "ftString",
-							width: 192,
+							width: 100,
 						},
 						{
 							title: "库区",
 							field: "kqName",
 							fieldType: "ftString",
-							width: 192,
+							width: 100,
 						},
            // {
            // 	title: "库位",
@@ -55,19 +55,19 @@
 							title: "事务类型",
 							field: "swlxName",
 							fieldType: "ftString",
-							width: 192,
+							width: 100,
 						},
 						{
 							title: "部门",
 							field: "bmName",
 							fieldType: "ftString",
-							width: 192
+							width: 100
 						},
 						{
 							title: "上架人",
 							field: "sjrName",
 							fieldType: "ftString",
-							width: 192
+							width: 100
 						},
 						{
 							title: "单据来源",
@@ -129,7 +129,7 @@
 							label: '日期',
 							startProp: "start",
 							endProp: "end",
-							span: 12,
+							span: 8,
 							type: 'RelDaterangeV2',
 							startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
 							endValue: new Date().getTime(),

--- a/src/views/ccgl/rkgl/sjrw/top/rkd.vue
+++ b/src/views/ccgl/rkgl/sjrw/top/rkd.vue
@@ -90,7 +90,7 @@
 								label: '日期',
 								startProp: "start",
 								endProp: "end",
-								span: 12,
+								span: 8,
 								type: 'RelDaterangeV2',
 								startValue: new Date().getTime()-1000*60*60*24*30,
 								endValue:new Date().getTime(),

--- a/src/views/ccgl/zlgl/jyd/top/index.vue
+++ b/src/views/ccgl/zlgl/jyd/top/index.vue
@@ -149,9 +149,9 @@
              },
              {
                label: '业务日期',
-                startProp: "ywrqb",
-                endProp: "ywrqe",
-                span: 9,
+                startProp: "start",
+                endProp: "end",
+                span: 8,
                type: 'RelDaterangeV2',
                startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
                endValue: new Date().getTime(),

--- a/src/views/ccgl/zlgl/kccjd/top/index.vue
+++ b/src/views/ccgl/zlgl/kccjd/top/index.vue
@@ -72,9 +72,9 @@
              },
              {
                label: '业务日期',
-                startProp: "ywrqb",
-                endProp: "ywrqe",
-                span: 9,
+                startProp: "start",
+                endProp: "end",
+                span: 8,
                type: 'RelDaterangeV2',
                startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
                endValue: new Date().getTime(),

--- a/src/views/ccgl/zlgl/kcyhd/top/index.vue
+++ b/src/views/ccgl/zlgl/kcyhd/top/index.vue
@@ -72,9 +72,9 @@
              },
              {
                label: '业务日期',
-                startProp: "ywrqb",
-                endProp: "ywrqe",
-                span: 9,
+                startProp: "start",
+                endProp: "end",
+                span: 8,
                type: 'RelDaterangeV2',
                startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
                endValue: new Date().getTime(),