变更

df3347c2 · 李苏 · 665e86af · df3347c2 · df3347c2 · df3347c2
Commit df3347c2 authored Dec 19, 2023 by 李苏 💬
19 changed files
--- a/src/views/ccgl/ckgl/ckd/mx.vue
+++ b/src/views/ccgl/ckgl/ckd/mx.vue
@@ -12,9 +12,11 @@
 </template>

 <script>
+   import wlsx from 'common/src/mixin/wlphsx.js'
  import wlphsx from 'common/src/mixin/wlphsx.js'
+  
  export default {
-    mixins:[wlphsx],
+    mixins:[wlsx,wlphsx],
    data() {
      return {
        power: {

--- a/src/views/ccgl/ckgl/ckd/top/edit.vue
+++ b/src/views/ccgl/ckgl/ckd/top/edit.vue
@@ -162,14 +162,6 @@
 							}
 						}
 					},
-					{
-						label: '领料人',
-						prop: 'llr',
-						span: 8,
-						type: 'input',
-						"required": true
-
-					},
          {
            label: '领料人',
            prop: 'llrid',

--- a/src/views/ccgl/ckgl/ckd/top/index.vue
+++ b/src/views/ccgl/ckgl/ckd/top/index.vue
@@ -75,6 +75,21 @@
 							field: "bmmc",
 							width: 140
 						},
+            {
+            	title: "单据来源",
+            	field: "djly",
+            	width: 140,
+              "transform": {
+              	"url": "wms/ckgl/llck/init/djly",
+              	"label": "name",
+              	"value": "id"
+              }
+            },
+            {
+            	title: "来源单据号",
+            	field: "lydjDjid",
+            	width: 140
+            },
 						{
 							title: "备注",
 							field: "bz",

--- a/src/views/ccgl/ckgl/dbckd/rkqd.vue
+++ b/src/views/ccgl/ckgl/dbckd/rkqd.vue
@@ -73,7 +73,7 @@
              },
              {
              	title: "唯一码",
-              	field: "packid",
+              	field: "packCode",
              	width: 240,
              },
             {

--- a/src/views/ccgl/ckgl/dbckd/top/index.vue
+++ b/src/views/ccgl/ckgl/dbckd/top/index.vue
@@ -86,6 +86,21 @@
                "value": "id"
              }
            },
+            {
+            	title: "单据来源",
+            	field: "djly",
+            	width: 140,
+              "transform": {
+              	"url": "wms/ckgl/dbck/init/djly",
+              	"label": "name",
+              	"value": "id"
+              }
+            },
+            {
+            	title: "来源单据号",
+            	field: "lydjDjid",
+            	width: 140
+            },
            {
              title: "备注",
              field: "bz",

--- a/src/views/ccgl/ckgl/jhd/hz.vue
+++ b/src/views/ccgl/ckgl/jhd/hz.vue
@@ -69,7 +69,7 @@
              },
              {
              	title: "唯一码",
-              	field: "packid",
+              	field: "packCode",
              	width: 100,
              },
              {

--- a/src/views/ccgl/ckgl/jhd/jg.vue
+++ b/src/views/ccgl/ckgl/jhd/jg.vue
@@ -70,7 +70,7 @@

            {
              title: "唯一码",
-              field: "wym",
+              field: "packCode",
              width: 100,
            },
            {
@@ -111,4 +111,4 @@
 </script>

 <style>
-</style>
\ No newline at end of file
+</style>
--- a/src/views/ccgl/rkgl/dbrkd/rkqd.vue
+++ b/src/views/ccgl/rkgl/dbrkd/rkqd.vue
@@ -73,7 +73,7 @@
              },
              {
              	title: "唯一码",
-              	field: "packid",
+              	field: "packCode",
              	width: 240,
              },
             {

--- a/src/views/ccgl/rkgl/dbrkd/top/index.vue
+++ b/src/views/ccgl/rkgl/dbrkd/top/index.vue
@@ -75,6 +75,21 @@
              field: "zt",
              width: 140
            },
+            {
+            	title: "单据来源",
+            	field: "djly",
+            	width: 140,
+              "transform": {
+              	"url": "wms/rkgl/dbrk/init/djly",
+              	"label": "name",
+              	"value": "id"
+              }
+            },
+            {
+            	title: "来源单据号",
+            	field: "lydjDjid",
+            	width: 140
+            },
            {
              title: "备注",
              field: "bz",

--- a/src/views/ccgl/rkgl/mpzy/rkqd.vue
+++ b/src/views/ccgl/rkgl/mpzy/rkqd.vue
@@ -74,7 +74,7 @@
              },
              {
              	title: "唯一码",
-              	field: "packid",
+              	field: "packCode",
              	width: 240,
              },
             {

--- a/src/views/ccgl/rkgl/rkd/mx.vue
+++ b/src/views/ccgl/rkgl/rkd/mx.vue
@@ -12,9 +12,10 @@
 </template>

 <script>
+  import wlsx from 'common/src/mixin/wlsx.js'
  import wlphsx from 'common/src/mixin/wlphsx.js'
  export default {
-    mixins:[wlphsx],
+    mixins:[wlphsx,wlsx],
    data() {
      return {
        power: {
@@ -77,11 +78,6 @@
              	field: "zlh",
              	width: 120,
              },
-            {
-              title: "库位",
-              field: "kwName",
-              width: 100,
-            },
            {
              title: "备注",
              field: "bz",

--- a/src/views/ccgl/rkgl/rkd/rkqd.vue
+++ b/src/views/ccgl/rkgl/rkd/rkqd.vue
@@ -72,7 +72,7 @@
            },
            {
              title: "唯一码",
-              field: "packid",
+              field: "packCode",
              width: 240,
            },
            {
@@ -118,4 +118,4 @@
 </script>

 <style>
-</style>
\ No newline at end of file
+</style>
--- a/src/views/ccgl/rkgl/rkd/top/edit.vue
+++ b/src/views/ccgl/rkgl/rkd/top/edit.vue
@@ -238,28 +238,28 @@
 						width: 200,
 					},

-					{
-						title: "库位",
-						field: "kwid",
-						width: 240,
-						type: 'AuxInput',
-						typeConfig: {
-							isRequest: false,
-							"code": "KWWH",
-							"label": "kwName",
-							queryParams: (row) => {
-								return {
-									ckid: this.form.ckid
-								}
-							},
-							"transform": {
-								"value": "id",
-								"label": "name"
-							}
+					// {
+					// 	title: "库位",
+					// 	field: "kwid",
+					// 	width: 240,
+					// 	type: 'AuxInput',
+					// 	typeConfig: {
+					// 		isRequest: false,
+					// 		"code": "KWWH",
+					// 		"label": "kwName",
+					// 		queryParams: (row) => {
+					// 			return {
+					// 				ckid: this.form.ckid
+					// 			}
+					// 		},
+					// 		"transform": {
+					// 			"value": "id",
+					// 			"label": "name"
+					// 		}

-						},
-						show: JSON.parse(localStorage.getItem('isKwgl')),
-					},
+					// 	},
+					// 	show: JSON.parse(localStorage.getItem('isKwgl')),
+					// },
 					{
 						title: "备注",
 						field: "bz",

--- a/src/views/ccgl/rkgl/rkd/top/index.vue
+++ b/src/views/ccgl/rkgl/rkd/top/index.vue
@@ -70,6 +70,21 @@
 							field: "bmName",
 							width: 140
 						},
+            {
+            	title: "单据来源",
+            	field: "djly",
+            	width: 140,
+              "transform": {
+              	"url": "wms/rkgl/rktz/init/djly",
+              	"label": "name",
+              	"value": "id"
+              }
+            },
+            {
+            	title: "来源单据号",
+            	field: "lydjDjid",
+            	width: 140
+            },
 						{
 							title: "备注",
 							field: "bz",

--- a/src/views/ccgl/rkgl/sjrw/mx.vue
+++ b/src/views/ccgl/rkgl/sjrw/mx.vue
@@ -69,7 +69,7 @@
              },
              {
              	title: "唯一码",
-              	field: "packid",
+              	field: "packCode",
              	width: 240,
              },
             {

--- a/src/views/ccgl/rkgl/sjrw/sjjg.vue
+++ b/src/views/ccgl/rkgl/sjrw/sjjg.vue
@@ -71,7 +71,7 @@
            },
            {
              title: "唯一码",
-              field: "packid",
+              field: "packCode",
              width: 240
            },
            {

--- a/src/views/ccgl/rkgl/sjrw/top/edit.vue
+++ b/src/views/ccgl/rkgl/sjrw/top/edit.vue
@@ -218,7 +218,7 @@
              },
              {
              	title: "唯一码",
-              	field: "packid",
+              	field: "packCode",
              	width: 240,
              },
             {

--- a/src/views/ccgl/rkgl/sjrw/top/index.vue
+++ b/src/views/ccgl/rkgl/sjrw/top/index.vue
@@ -82,9 +82,8 @@
 						},
 						{
 							title: "来源单据号",
-							field: "lydjid",
-							fieldType: "ftString",
-							width: 192
+							field: "lydjDjid",
+							width: 140
 						},
 						{
 							title: "状态",

--- a/src/views/ccgl/rkgl/sjrw/top/rkqd.vue
+++ b/src/views/ccgl/rkgl/sjrw/top/rkqd.vue
@@ -73,7 +73,7 @@
              },
              {
              	title: "唯一码",
-              	field: "packid",
+              	field: "packCode",
              	width: 240,
              },
             {