change some field setting and add CKQD

src/views/ccgl/ckgl/dbckd/rkqd.vue → src/views/ccgl/ckgl/dbckd/ckqd.vue

@@ -38,58 +38,72 @@
         },
         config: {
           /* 基本配置*/
-          url: 'wms/rkgl/dbrk',
-          queryUrl: 'wms/rkgl/dbrk/query/dbrkqd',
-          tableTitle: [{
+          url: 'wms/ckgl/dbck/wms/ckgl/dbck',
+          queryUrl:'wms/ckgl/dbck/wms/ckgl/dbck',
+          tableTitle: [
+            {
+            		title: "库位",
+            		field: "kwcode",
+            		width: 100,
+            	},
+            	{
+            		title: "库位名称",
+            		field: "wlxxName",
+            		width: 120,
+            	},
+            	{
             		title: "物料编码",
-              field: "wlcode",
-              fieldType: "upper",
+            		field: "wlxxCode",
             		width: 140
             	},
             	{
             		title: "物料名称",
-                field: "wlmc",
-                width: 140
+            		field: "wlxxName",
+            		width: 160
             	},
               {
-                title: "物料规格",
-                field: "gg",
+              	title: "物料批号",
+              	field: "wlph",
+              	width: 140,
+              },
+            	{
+            		title: "规格",
+            		field: "wlxxGg",
             		width: 140
             	},
               {
-              	title: "制令号",
-              	field: "zlh",
+                title: "货主",
+                field: "hzName",
                 width: 180,
               },
               {
-                  title: "物料批号",
-                  field: "wlph",
-                  width: 180
+                title: "制令号",
+                field: "zlh",
+                width: 180,
               },
               {
-              	title: "应收数量",
-              	field: "yssl",
-                width: 100,
+                title: "库存数量",
+                field: "kcsl",
+                width: 180,
+                fieldType:'float'
               },
             	{
-              	title: "唯一码",
-              	field: "packCode",
+            	  title: "库位",
+            	  field: "kwName",
             	  width: 240,
+
             	},
             	{
             	  title: "容器",
             	  field: "rqCode",
-             	width: 100,
+            	  width: 160,
+
             	},
             	{
-             	title: "状态",
-             	field: "zt",
-             	width: 100,
-              "transform": {
-              							    "url": "wms/rkgl/dbrk/init/zt",
-              							    "label": "name",
-              							    "value": "id"
-              							  }
+            	  title: "唯一码",
+            	  field: "packid",
+            	  width: 180,
+
             	}
           ],
           queryParams: [],

src/views/ccgl/ckgl/dbckd/index.vue

@@ -8,12 +8,12 @@
       <div class="bottom flex">
         <div class="full"  >
             <el-tabs class="full" v-model="activeName" >
-              <el-tab-pane  class="full" label="出库单明细" name="first">
+              <el-tab-pane  class="full" label="出库明细" name="first">
                 <ckdmx   @getRow='ckdmxGetRow'  ref="ckdmx" class="full"  />
               </el-tab-pane>
-     <!--         <el-tab-pane   class="full" label="入库清单" name="second">
-              <Rkqd ref="rkqd" class="full" />
-              </el-tab-pane> -->
+             <el-tab-pane   class="full" label="出库清单" name="second">
+              <ckqd ref="ckqd" class="full" />
+              </el-tab-pane>
             </el-tabs>
 
         </div>
@@ -26,10 +26,10 @@
 <script>
   import Top from './top/index.vue'
   import ckdmx from './ckdmx.vue'
-  import Rkqd from './rkqd.vue'
+  import ckqd from './ckqd.vue'
   export default {
     components: {
-      Top,ckdmx,Rkqd
+      Top,ckdmx,ckqd
       // Left
     },
     data(){
@@ -45,8 +45,8 @@
         this.$refs.ckdmx.$refs.basePage.$refs['TablePager'].pageQuery({
           setFirstCurrent: true
         })
-        // this.$refs.rkqd.$refs.basePage.queryParams.mid = mid
-        // this.$refs.rkqd.$refs.basePage.$refs['TablePager'].pageQuery()
+        this.$refs.ckqd.$refs.basePage.queryParams.mid = mid
+        this.$refs.ckqd.$refs.basePage.$refs['TablePager'].pageQuery()
       },
       ckdmxGetRow(row){
         let mid = row.id

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

@@ -254,6 +254,7 @@
             title: "物料批号",
             field: "wlph",
             type: 'inputText',
+             allowEdit: false,
             width: 180,
           },
           {

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

@@ -228,6 +228,8 @@
             title: "出库数量",
             field: "cksl",
             width: 200,
+            allowEdit: false,
+            type: 'inputNumber',
           },
           {
             title: "物料批号",

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

@@ -58,13 +58,11 @@
       			title: "库位",
       			field: "kwcode",
       			width: 100,
-      			hidden: !JSON.parse(localStorage.getItem('iskwgl'))
       		},
       		{
       			title: "库位名称",
       			field: "wlxxName",
       			width: 120,
-      			hidden: !JSON.parse(localStorage.getItem('isKwgl'))
       		},
       		{
       			title: "物料编码",
@@ -100,6 +98,7 @@
             title: "库存数量",
             field: "kcsl",
             width: 180,
+            fieldType:'float'
           },
       		{
       		  title: "库位",
@@ -116,7 +115,7 @@
       		{
       		  title: "唯一码",
       		  field: "packid",
-      		  width: 160,
+      		  width: 180,
 
       		},