基础功能调整

src/store/modules/permission.js

@@ -149,11 +149,11 @@ const permission = {
               newmenus.push(mi)
             }
           })
-           res.data=[...
-            newCommonList, ...newErpList, ...newPowerRoutes]
-          // res.data = dynamicRouter([...newCommonList, ...newErpList, ...newPowerRoutes], asymenus) || [...
-          //   newCommonList, ...newErpList, ...newPowerRoutes
-          // ]
+           // res.data=[...
+           //  newCommonList, ...newErpList, ...newPowerRoutes]
+          res.data = dynamicRouter([...newCommonList, ...newErpList, ...newPowerRoutes], asymenus) || [...
+            newCommonList, ...newErpList, ...newPowerRoutes
+          ]
           /* 重置首页路由*/
           // let hompePage = treeToList([...newCommonList,...newErpList,...newPowerRoutes]).filter(item=>item.mkid==localStorage.getItem('homeMkid'))
           let ttlist = treeToList([...newCommonList, ...newErpList, ...newPowerRoutes])

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

@@ -20,17 +20,12 @@
 					</template> -->
         </editTableForEdit>
       </div>
-      <el-row class="bottomInfo" :gutter="20">
-        <el-col class="center" :span="12">
-          创建人:{{
-						form.cjr||localUser
-					}}
-        </el-col>
-        <el-col class="center" :span="12">
-          创建时间:{{
-						$moment(form.cjsj).format('YYYY-MM-DD HH:mm:ss')||$moment().format('YYYY-MM-DD HH:mm:ss')
-					  }}
-        </el-col>
+    <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" />
+    	<!-- 额外数据 -->
     </el-row>
     </el-form>
 

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

@@ -14,17 +14,12 @@
           :editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow'
           :editTableData="formDetail" />
       </div>
-      <el-row class="bottomInfo" :gutter="20">
-        <el-col class="center" :span="12">
-          创建人:{{
-						form.cjr||localUser
-					}}
-        </el-col>
-        <el-col class="center" :span="12">
-          创建时间:{{
-						$moment(form.cjsj).format('YYYY-MM-DD HH:mm:ss')||$moment().format('YYYY-MM-DD HH:mm:ss')
-					  }}
-        </el-col>
+     <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" />
+     	<!-- 额外数据 -->
      </el-row>
     </el-form>
 

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

@@ -23,17 +23,12 @@
           </template>
         </editTableForEdit>
       </div>
-      <el-row class="bottomInfo" :gutter="20">
-        <el-col class="center" :span="12">
-          创建人:{{
-						form.cjr||localUser
-					}}
-        </el-col>
-        <el-col class="center" :span="12">
-          创建时间:{{
-						$moment(form.cjsj).format('YYYY-MM-DD HH:mm:ss')||$moment().format('YYYY-MM-DD HH:mm:ss')
-					  }}
-        </el-col>
+     <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" />
+     	<!-- 额外数据 -->
      </el-row>
     </el-form>
 

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

@@ -15,17 +15,12 @@
 					:editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow'
 					:editTableData="formDetail" />
 			</div>
-			<el-row class="bottomInfo" :gutter="20">
-				<el-col class="center" :span="12">
-					创建人:{{
-						form.cjr||localUser
-					}}
-				</el-col>
-				<el-col class="center" :span="12">
-					创建时间:{{
-						$moment(form.cjsj).format('YYYY-MM-DD HH:mm:ss')||$moment().format('YYYY-MM-DD HH:mm:ss')
-					  }}
-				</el-col>
+			<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" />
+				<!-- 额外数据 -->
 			</el-row>
 		</el-form>
 

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

@@ -21,17 +21,12 @@
           </template>
         </editTableForEdit>
       </div>
-      <el-row class="bottomInfo" :gutter="20">
-        <el-col class="center" :span="12">
-          创建人:{{
-						form.cjr||localUser
-					}}
-        </el-col>
-        <el-col class="center" :span="12">
-          创建时间:{{
-						$moment(form.cjsj).format('YYYY-MM-DD HH:mm:ss')||$moment().format('YYYY-MM-DD HH:mm:ss')
-					  }}
-        </el-col>
+     <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" />
+     	<!-- 额外数据 -->
      </el-row>
     </el-form>
 

src/views/ccgl/rkgl/rkdj/edit.vue

 <template>
-	<RelDialog bigTitle detailTable='KCSW' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp'
+	<RelDialog @getForm='getForm' bigTitle detailTable='KCSW' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp'
 		:app='app' :buttonApp='buttonApp'>
 		<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
 			<el-row :gutter="20" :app="this" class="editRow">
@@ -15,17 +15,12 @@
 					ref="editTableForEdit" :editTableTitle='editTableTitle' v-if="editTableForEdit"
 					:computedRow='computedRow' :editTableData="formDetail" />
 			</div>
-			<el-row class="bottomInfo" :gutter="20">
-				<el-col class="center" :span="12">
-					创建人:{{
-						form.cjr||localUser
-					}}
-				</el-col>
-				<el-col class="center" :span="12">
-					创建时间:{{
-						$moment(form.cjsj).format('YYYY-MM-DD HH:mm:ss')||$moment().format('YYYY-MM-DD HH:mm:ss')
-					  }}
-				</el-col>
+			<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" />
+				<!-- 额外数据 -->
 			</el-row>
 		</el-form>
 
@@ -45,7 +40,17 @@
 
 	export default {
 		mixins: [editMixin, editMixin_expand],
+    mounted() {
+      this.$nextTick(()=>{
+        this.form.whr=this.username
+        this.form.rkr=this.username
+      })
+
+    },
 		methods: {
+      getForm(row){
+        row.transrkd=row.rktzDjid||row.dbrkDjid
+      },
 			/* 需要整体row时的回调 */
 			computedRow(row) {
 				// this.$refs.editTableForEdit.$forceUpdate()
@@ -92,10 +97,43 @@
 		},
 		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: 'whr',
+            type: 'input',
+            span: 8,
+            readonly:true,
+          },
+
+          {
+            label: '维护时间',
+            prop: 'whsj',
+            span: 8,
+            type: 'datetime',
+             readonly:true,
+             value:new Date().getTime()
+          }
+        ],
 				/* 常规edit数据 */
 				editColItemList: [{
 						label: '入库单号',
-						prop: 'lydjid',
+						prop: 'transrkd',
 						span: 8,
 						type: 'input',
 						"required": true,
@@ -159,10 +197,9 @@
 							}
 						}
 					},
-
 					{
 						label: '保管员',
-						prop: 'rkr',
+						prop: 'bgy',
 						span: 8,
 						type: 'input',
 
@@ -173,10 +210,6 @@
 						span: 16,
 						type: 'input',
 					},
-
-
-
-
 				],
 				/* 从表编辑数据 */
 				editTableTitle: [{
@@ -186,47 +219,55 @@
 						align: "center"
 					},
 					{
-						title: "物料编号",
-						field: "code",
-						width: 240,
+						title: "物料编码",
+						field: "wlxxCode",
+						width: 180,
 						type: 'AuxInput',
 						typeConfig: {
 							"code": "MATERIAL",
-							"label": "wlcode",
+							"label": "wlxxCode",
 							"transform": {
 								"value": "code",
 								"label": "code"
 							},
 							give(data) {
 								this.form.wlid = data.id
-								this.form.wlmc = data.name
-								this.form.wlcode = data.code
-
+								this.form.wlxxName = data.name
+								this.form.w;xxCode = data.code
 							}
 
 						}
 					},
 					{
 						title: "物料名称",
-						field: "wlmc",
+						field: "wlxxName",
 						width: 160
 					},
 					{
 						title: "规格",
-						field: "gg",
+						field: "wlxxGg",
 						width: 140
 					},
+          {
+          	title: "批号",
+          	field: "wlph",
+          	type: 'inputText',
+          	width: 200,
+          },
+          {
+          	title: "制令号",
+          	field: "zlh",
+          	type: 'inputText',
+          	width: 200,
+          },
 					{
 						title: "应入库数量",
-						field: "yssl",
-						width: 100,
 						allowEdit: false,
 						show: this.type != 'view'
 					},
 					{
 						title: "已入库数量",
 						field: "yrksl",
-						width: 100,
 						allowEdit: false,
 						show: this.type != 'view'
 					},
@@ -236,78 +277,17 @@
 						field: "rksl",
 						allowEdit: true,
 						type: 'inputNumber',
-						width: 200,
 						blur: toFixed(null),
 						change: row => doRkdChange(row, 'rksl')
 					},
 					{
 						title: "计量单位",
-						field: "jldwname",
+						field: "jldwName",
 						width: 100,
 						allowEdit: false
 					},
-					{
-						title: "含税价格",
-						field: "hsjg",
-						fieldType: 'price',
-						type: "inputNumber",
-						blur: toFixed(null),
-						change: row => doRkdChange(row, 'hsjg')
-					},
-					{
-						title: "含税金额",
-						field: "hsje",
-						fieldType: 'money',
-						type: "inputNumber",
-						blur: toFixed(null),
-						change: row => doRkdChange(row, 'hsje')
-					},
-					{
-						title: "增值税率%",
-						field: "zzsl",
-						fieldType: 'zzsl',
-						type: "inputNumber",
-						blur: toFixed(null),
-						change: row => doRkdChange(row, 'zzsl')
-					},
-					{
-						title: "入库价格",
-						field: "wsjg",
-						fieldType: "price",
-						type: "inputNumber",
-						blur: toFixed(null),
-						change: row => doRkdChange(row, 'wsjg'),
-						show: this.type != 'view'
-					},
-					{
-						title: "入库金额",
-						field: "wsje",
-						fieldType: "money",
-						type: "inputNumber",
-						blur: toFixed(null),
-						change: row => doRkdChange(row, 'wsje'),
-						show: this.type != 'view'
-					},
-					{
-						title: "入库价格",
-						field: "jyjg",
-						type: "inputNumber",
-						show: this.type == 'view',
-					},
-					{
-						title: "入库金额",
-						field: "rkje",
-						type: "inputNumber",
-						show: this.type == 'view'
-					},
 
-					{
-						title: "物料批号",
-						field: "wlph",
-						type: 'inputText',
-						width: 200,
-						show: JSON.parse(localStorage.getItem('isPhgl'))
-					},
+
 					{	show: JSON.parse(localStorage.getItem('isKwgl')),
 						title: "库位",
 						field: "kwid",

src/views/ccgl/rkgl/rkdj/index.vue

 <template>
-	<BasePage addRename='选择入库单入库' class="min_full" :config="config">
+	<BasePage :power='power' addRename='选择入库单入库' class="min_full" :config="config">
 		<template #dialog="ctx">
 			<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
 		</template>
@@ -12,6 +12,21 @@
 	export default {
 		data() {
 			return {
+         power: {
+                  add: false,
+                  copy: false,
+                  /* 手动控制删除 */
+                  delButton: false,
+                  /* 手动控制编辑按钮权限 */
+                  editButton: false,
+                  /* 是否渲染右侧操作按钮 */
+                  operateButtons: false,
+                  /* 是否开启工作流按钮 */
+                  workFlow: false,
+                  /* 表格开启选择，以及记住选择 */
+                  showSelection: false,
+                  saveSelected: false
+                },
 				config: {
 					queryDetail: true,
 					/* 基本配置*/
@@ -19,12 +34,16 @@
 					tableTitle: [
 						  {title: "库存单号", field: "djid", width: 140},
 						                    {title: "入库日期", field: "ywrq", fieldType: 'ftDate'},
-						                    {title: "仓库", field: "ckmc", width: 140},
-						                    {title: "事务类型", field: "swlxmc", width: 100},
-						                    {title: "入库部门", field: "bmName", width: 130},
-						                    {title: "入库人", field: "rkr", width: 120},
+						                    {title: "仓库", field: "ckName", width: 140},
+						                    {title: "事务类型", field: "swlxName", width: 100},
+						                    {title: "部门", field: "bmName", width: 130},
+						                    {title: "入库人", field: "jsr", width: 120},
 						                    {title: "保管员", field: "bgy", width: 120},
-						                    {title: "入库单号", field: "lydjid", width: 140},
+						                    {title: "入库单号", field: "lydjid", width: 140,
+                                  formatter(a, b, c) {
+                                                return a.rktzDjid || a.dbrkDjid
+                                              }},
+                                 {title: "上架单号", field: "sjtzDjid", width: 140},
 						                    {title: "备注", field: "bz", width: 220},
 						                    {title: "维护人", field: "whr"},
 						                    {title: "维护时间", field: "whsj", fieldType: 'ftDateTime'}

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

@@ -20,17 +20,12 @@
           </template>
           </editTableForEdit>
       </div>
-      <el-row class="bottomInfo" :gutter="20">
-        <el-col class="center" :span="12">
-          创建人:{{
-						form.cjr||localUser
-					}}
-        </el-col>
-        <el-col class="center" :span="12">
-          创建时间:{{
-						$moment(form.cjsj).format('YYYY-MM-DD HH:mm:ss')||$moment().format('YYYY-MM-DD HH:mm:ss')
-					  }}
-        </el-col>
+      <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" />
+      	<!-- 额外数据 -->
       </el-row>
     </el-form>