1

src/views/ccgl/ckgl/ckd/top/edit.vue

@@ -25,7 +25,6 @@
     		v-for="(item,index) in editColItemList2 " :value="item.value" :span="item.span" :label="item.label"
     		:prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig'
     		:rule="item.rule" />
-    	<!-- 额外数据 -->
     </el-row>
     </el-form>
 

src/views/ccgl/cxfx/kwxq/index.vue

 <template>
-  <BasePage class="min_full" :config="config">
+  <BasePage :power='power' class="min_full" :config="config">
     <template #dialog="ctx">
       <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
     </template>
@@ -16,6 +16,21 @@
   export default {
     data() {
       return {
+        power: {
+                  add: false,
+                  copy: false,
+                  /* 手动控制删除 */
+                  delButton: false,
+                  /* 手动控制编辑按钮权限 */
+                  editButton: false,
+                  /* 是否渲染右侧操作按钮 */
+                  operateButtons: false,
+                  /* 是否开启工作流按钮 */
+                  workFlow: false,
+                  /* 表格开启选择，以及记住选择 */
+                  showSelection: false,
+                  saveSelected: false
+                },
         config: {
           /* 基本配置*/
           url: 'wms/cxfx/kwmx',
@@ -85,8 +100,8 @@
               width: 140
             },
             {
-              title: "数量",
-              field: "sl",
+              title: "库存数量",
+              field: "kcsl",
               width: 140
             }
 

src/views/ccgl/rkgl/mpzy/mx.vue

@@ -64,6 +64,11 @@
                 field: "wlph",
                 width: 140
               },
+              {
+                title: "制令号",
+                field: "zlh",
+                width: 140
+              },
               {
                 title: "码盘数量",
                 field: "mpsl",
@@ -74,11 +79,7 @@
                 field: "rqCode",
                 width: 140
               },
-              {
-                title: "制令号",
-                field: "zlh",
-                width: 140
-              },
+            
               {
                 title: "唯一码",
                 field: "packCode",

src/views/ccgl/rkgl/rkd/top/edit.vue

@@ -5,8 +5,7 @@
       <el-row :gutter="20" :app="this" class="editRow">
         <EditColItem :required="item.required||false" :readonly="item.readonly?true:false "
           v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label"
-					:prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig'
-					:rule="item.rule" />
+          :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
         <!-- 额外数据 -->
       </el-row>
 
@@ -25,9 +24,7 @@
       <el-row :gutter="20" :app="this" class="editRow bottomInfo">
         <EditColItem :required="item.required||false" :readonly="item.readonly?true:false "
           v-for="(item,index) in editColItemList2 " :value="item.value" :span="item.span" :label="item.label"
-      		:prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig'
-      		:rule="item.rule" />
-      	<!-- 额外数据 -->
+          :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
       </el-row>
       <!-- 		<el-row class="bottomInfo" :gutter="20">
 				<el-col class="center" :span="12">
@@ -79,22 +76,21 @@
       }
     },
     mounted() {
-      this.$nextTick(()=>{
-        this.form.whr=this.username
-        this.form.rkr=this.username
+      this.$nextTick(() => {
+        this.form.whr = this.username
+        this.form.rkr = this.username
       })
 
     },
     data() {
       return {
-        editColItemList2:[
-          {
+        editColItemList2: [{
             "label": "状态",
             "prop": "zt",
             "span": 8,
             "type": "RelSelect",
             "value": "",
-            readonly:true,
+            readonly: true,
             "typeConfig": {
               "src": "wms/rkgl/rktz/init/zt",
               "match": {
@@ -108,7 +104,7 @@
             prop: 'whr',
             type: 'input',
             span: 8,
-            readonly:true,
+            readonly: true,
           },
 
           {
@@ -116,8 +112,8 @@
             prop: 'whsj',
             span: 8,
             type: 'datetime',
-             readonly:true,
-             value:new Date().getTime()
+            readonly: true,
+            value: new Date().getTime()
           }
         ],
         /* 常规edit数据 */
@@ -187,10 +183,26 @@
             type: 'input',
             "required": true,
           },
+          {
+            label: '货主',
+            prop: 'hzid',
+            span: 8,
+            type: 'AuxInput',
+            // required: true,
+            typeConfig: {
+              isRequest: true,
+              code: 'HZID',
+              label: 'hzName',
+              transform: {
+                value: 'id',
+                label: 'name'
+              }
+            }
+          },
           {
             label: '备注',
             prop: 'bz',
-						span: 24,
+            span: 16,
             type: 'input',
           },
 

src/views/ccgl/rkgl/rkd/top/index.vue

@@ -49,6 +49,11 @@
 							field: "rkr",
 							width: 140
 						},
+            {
+            	title: "货主",
+            	field: "hzName",
+            	width: 140
+            },
 						{
 							title: "事务类型",
 							field: "swlxName",

src/views/ccgl/rkgl/sjrw/top/edit.vue

@@ -126,13 +126,13 @@
         editColItemList: [{
             label: '单据号',
             prop: 'djid',
-            span: 12,
+            span: 8,
             type: 'input',
           },
           {
             "label": "仓库",
             "prop": "ckid",
-            "span": 12,
+            "span": 8,
             "type": "RelSelect",
             "value": "",
             "required": true,
@@ -147,7 +147,7 @@
           {
             "label": "事务类型",
             "prop": "swlxid",
-            "span": 12,
+            "span": 8,
             "type": "RelSelect",
             "value": "",
             "required": true,
@@ -162,7 +162,7 @@
           {
             "label": "部门",
             "prop": "bmid",
-            "span": 12,
+            "span": 8,
             "type": "RelSelect",
             "value": "",
             "typeConfig": {
@@ -176,7 +176,7 @@
           {
             label: '业务日期',
             prop: 'ywrq',
-            span: 12,
+            span: 8,
             type: 'date',
             value: new Date().getTime(),
             "required": true,
@@ -184,7 +184,7 @@
           {
             label: '上架人',
             prop: 'sjrid',
-            span: 12,
+            span: 8,
             "required": true,
             type: 'AuxInput',
             typeConfig: {

src/views/ccgl/rkgl/sjrw/top/index.vue

@@ -69,6 +69,12 @@
 							fieldType: "ftString",
 							width: 100
 						},
+            {
+              title: "货主",
+              field: "hzName",
+              fieldType: "ftString",
+              width: 100
+            },
 						{
 							title: "单据来源",
 							field: "djly",
@@ -79,6 +85,11 @@
 							},
 							width: 80
 						},
+            {
+              title: "来源单号",
+              field: "rktzDjid",
+              width: 140
+            },
 						{
 							title: "来源单据号",
 							field: "lydjDjid",