调整

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

@@ -129,7 +129,7 @@
 							{
 								"label": "仓库",
 								"prop": "ckid",
-								"span": 4,
+								"span": 8,
 								"type": "RelSelect",
 								"value": "",
 								"typeConfig": {
@@ -143,7 +143,7 @@
               {
               	"label": "库区",
               	"prop": "kqid",
-              	"span": 4,
+              	"span": 8,
               	"type": "RelSelect",
               	"value": "",
               	"typeConfig": {
@@ -156,36 +156,39 @@
               		}
               	}
               },
+
+
+
+						],[
               {
               	label: '单据编号',
               	prop: 'djid',
-								span: 4,
+              	span: 8,
               	type: 'input',
               	value: ''
               },
               {
               	label: '货主',
               	prop: 'hzInfo',
-              	span: 4,
+              	span: 8,
               	type: 'input',
               	value: ''
-              }
-
-
-						],[
+              },
 							{
 							  label: '状态',
 							  prop: 'zt',
-							  span: 4,
+							  span: 8,
 							  type: 'RelSelect',
 							  typeConfig: {
 							    src: 'wms/ckgl/jhtz/init/zt'
 							  }
 							},
+
+						],[
               {
                 label: '事务类型',
                 prop: 'swlxid',
-                span: 4,
+                span: 8,
                 type: 'RelSelect',
                 typeConfig: {
                   src: 'wms/ckgl/jhtz/init/swlx'

src/views/ccgl/ckgl/jhd/tzqd.vue

@@ -8,6 +8,10 @@
         <div class="tzqdItem text-ellipsis " >
           物料编码:{{app.singleItem.wlxxCode}}
         </div>
+
+      </div>
+      <div style="height: 50px;width: 100%;display: flex;" >
+
         <div class="tzqdItem text-ellipsis " >
           物料规格:{{app.singleItem.wlxxGg}}
         </div>
@@ -21,7 +25,7 @@
       <div  style="display: flex;height: 60vh;" >
         <!-- 左表数据-->
         <div class="tzqdLeft">
-          <BasePage  @pageQueryFinally.once='pageQueryFinally'  ref="basePage" @getRow='getRow' :autoQuery='false' :power="{
+          <BasePage :showPagination='false' @pageQueryFinally.once='pageQueryFinally'  ref="basePage" @getRow='getRow' :autoQuery='false' :power="{
             add: false,
             copy: false,
             /* 手动控制删除 */
@@ -42,7 +46,7 @@
                 <template slot-scope="scope">
                   <el-button style="text-align: center;color: cornflowerblue;width: 100%;"
                     @click.native.prevent="cz(scope.$index,scope,scope.row)" type="text" size="small">
-                    <i class="el-icon-edit"></i>操作
+                    <i class="el-icon-edit"></i>调整
                   </el-button>
 
                 </template>
@@ -178,6 +182,29 @@
               field: "kcsl",
               width: 140
             },
+            {
+              title: "已分配数量",
+              field: "yfpsl",
+              width: 140,
+              formatter(a,b,v){
+                if(!v){
+                  return 0
+                }else{
+                  return v
+                }
+              }
+            },
+
+            {
+              label: '容器',
+              prop: 'rqCode',
+              width: 100,
+            },
+            {
+              title: "唯一码",
+              field: "packCode",
+              width: 140
+            },
             {
               title: "制令号",
               field: "zlh",
@@ -193,20 +220,6 @@
               field: "hzName",
               width: 140
             },
-            {
-              title: "唯一码",
-              field: "packCode",
-              width: 140
-            },
-            {
-              title: "维护人",
-              field: "whr"
-            },
-            {
-              title: "维护时间",
-              field: "whsj",
-              fieldType: 'ftDateTime'
-            }
           ],
           queryParams: [
 
@@ -240,6 +253,7 @@
                 if (ritem.packid == item.packid) {
                   /* 减少初始数量*/
                   ritem.kcsl=ritem.kcsl-item.jhsl
+                  ritem.yfpsl=item.jhsl
                 }
               })
             })
@@ -308,6 +322,7 @@
         /* 数量记录为新*/
         this.sljl[item.packid] = n
         item.kcsl = item.kcsl + slc
+        item.yfpsl=n
 
       },
       getRow(val) {
@@ -329,6 +344,11 @@
         this.editTableConfig.editTableData.splice(index, 1)
       },
       cz(a, b, row) {
+
+        if(this.app.singleItem.zt!='I'){
+          this.$warning('非初始状态不允许调整')
+          return
+        }
         /* 根据packid判定是否添加清单数据*/
         let packid = row.packid
         let hasrow = false
@@ -374,6 +394,7 @@
     height: 100%;
   }
   .text-ellipsis {
+    padding-right: 10px;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;