字段部分调整

src/router/index.js

@@ -357,9 +357,6 @@ export const powerRoutes = [
             name: 'gysxx',
             path: "gysxx",
           }
-
-
-
         ],
       },
       /* 入库管理 */

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

@@ -23,13 +23,12 @@
           </template>
         </editTableForEdit>
       </div>
-     <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-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>
 
     <!-- editTab数据 -->
@@ -66,7 +65,10 @@
           row
         } = obj
         this.form.swlxid = row.swlxid
+        this.form.lydjDjid=row.djid
         this.form.lydjid = row.id
+        this.form.hzid = row.hzid
+        this.form.hzName = row.hzName
         this.form.ckid = row.ckid
         this.form.bmid = row.bmid
         this.form.ywrq = row.ywrq
@@ -87,6 +89,9 @@
           row
         } = obj
         this.form.swlxid = row.swlxid
+        this.form.lydjDjid=row.djid
+        this.form.hzid = row.hzid
+        this.form.hzName = row.hzName
         this.form.lydjid = row.id
         this.form.ckid = row.ckid
         this.form.bmid = row.bmid
@@ -110,7 +115,7 @@
         this.DialogTitle = '选择调拨出库单'
         this.showDialog = true
       },
-      save(){},
+      save() {},
       /* 选择库存回调 */
       savekc(list) {
         list.forEach(item => {
@@ -133,10 +138,11 @@
         DialogWidth: '80vw',
         /* 常规edit数据 */
         editColItemList: [{
-            label: '拣货单号',
-            prop: 'djid',
+            label: '出库单号',
+            prop: 'lydjDjid',
             span: 8,
             type: 'input',
+            readonly:true
             // "required": true,
           },
           // {
@@ -156,7 +162,7 @@
             "required": true,
           },
           {
-            readonly:true,
+            readonly: true,
             "label": "仓库",
             "prop": "ckid",
             "span": 8,
@@ -189,7 +195,7 @@
             }
           },
           {
-            readonly:true,
+            readonly: true,
             "label": "事务类型",
             "prop": "swlxid",
             "span": 8,
@@ -205,7 +211,7 @@
             }
           },
           {
-             readonly:true,
+            readonly: true,
             "label": "部门",
             "prop": "bmid",
             "span": 8,
@@ -220,6 +226,22 @@
               }
             }
           },
+          {
+            label: '货主',
+            prop: 'hzid',
+            span: 8,
+            required: true,
+            type: 'AuxInput',
+            typeConfig: {
+              isRequest: true,
+              code: 'HZID',
+              label: 'hzName',
+              transform: {
+                value: 'id',
+                label: 'name'
+              }
+            }
+          },
           {
             label: '拣货人',
             prop: 'jhrid',
@@ -238,7 +260,7 @@
           {
             label: '备注',
             prop: 'bz',
-            span: 16,
+            span: 24,
             type: 'input',
           },
         ],
@@ -274,7 +296,7 @@
           {
             title: "拣出数量",
             field: "jcsl",
-           type: 'inputNumber',
+            type: 'inputNumber',
             allowEdit: false,
           },
           // {

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

@@ -85,7 +85,7 @@
             },
             {
               title: "单据来源号",
-              field: "djlyCode",
+              field: "lydjDjid",
               width: 140
             },
             {

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

@@ -2,19 +2,19 @@
   <DefaultDialog :app='app'>
     <div slot="form" >
       <div style="height: 50px;width: 100%;display: flex;" >
-        <div class="tzqdItem">
+        <div class="tzqdItem text-ellipsis ">
           物料名称:{{app.singleItem.wlxxName}}
         </div>
-        <div class="tzqdItem" >
+        <div class="tzqdItem text-ellipsis " >
           物料编码:{{app.singleItem.wlxxCode}}
         </div>
-        <div class="tzqdItem" >
+        <div class="tzqdItem text-ellipsis " >
           物料规格:{{app.singleItem.wlxxGg}}
         </div>
-        <div class="tzqdItem" >
+        <div class="tzqdItem text-ellipsis " >
           物料批号:{{app.singleItem.wlph}}
         </div>
-        <div class="tzqdItem" >
+        <div class="tzqdItem text-ellipsis " >
           制令号:{{app.singleItem.zlh}}
         </div>
       </div>
@@ -373,6 +373,11 @@
     width: 50%;
     height: 100%;
   }
+  .text-ellipsis {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+  }
 
   .tzqdRight {
     width: 50%;