修改台账/分单

src/components/setFormModel/index.vue

@@ -13,7 +13,7 @@
         <div class="title">
           <span class="left"></span>
           <span class="right"></span>
-          <span class="tip">已显示数据列，可<b>拖动</b>调整显示顺序</span>
+          <span class="tip">已显示数据列，可<b>拖动</b>调整显示顺序 <template v-if="maxNum!=0">, 最多可选30条</template></span>
         </div>
         <div class="label-box">
           <draggable v-model="fromLabel" animation="300" @start="onStart" @end="emitFromChange">
@@ -71,6 +71,10 @@ export default {
     type: {
       type: String,
       default: ''
+    },
+    maxNum: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -106,15 +110,16 @@ export default {
       this.visible = false
     },
     addFrom(item, index) {
-      console.log(item)
+      console.log(item, this.fromLabel.length)
+      if (this.maxNum !== 0 && this.fromLabel.length > (this.maxNum + 1)) {
+        this.$message.error(`最多选择${this.maxNum}条`)
+        return false
+      }
       if (this.type === 'from') {
         item.field = item.label.toLowerCase()
+      }
       this.fromLabel.push(item)
       this.fromAllLabel.splice(index, 1)
-      } else if (this.type === 'table') {
-        this.fromLabel.push(item)
-        this.fromAllLabel.splice(index, 1)
-      }
     },
     removeFrom(item, index) {
       this.fromAllLabel.push(item)

src/views/main/BookingLedger/detail/components/selectView.vue

@@ -112,6 +112,11 @@ export default {
     defaultVal(nval, oval) {
       if (this.inEdit) { return false }
       this.value = nval
+    },
+    value (nval, oval) {
+      if (nval !== oval) {
+        console.log('=== 6. select 修改 - value变化 ===', nval, oval)
+      }
     }
   },
   mounted() {
@@ -304,6 +309,7 @@ export default {
        }
     },
     handleChange (op) {
+      console.log('=== 1. select 修改 - change ===', op)
       // this.selectOpen = !this.selectOpen
       this.inEdit = true
       setTimeout(() => {
@@ -325,7 +331,7 @@ export default {
     },
     getSelectFirst (e, canClick = true) {
       if (canClick) {
-        document.getElementsByClassName(`select-input-${this.type}`)[0].click()
+        this.$refs.selectView.$refs.vcSelect.$refs.arrow.click()
       } else {
         this.$refs.selectView.$refs.vcSelect.focus()
       }
@@ -360,6 +366,7 @@ export default {
     },
 
     handleSearch (e) {
+      // console.log('=== 2. select 修改 - search ===', e)
       if (this.openSearch) {
         this.inEdit = true
         setTimeout(() => {
@@ -396,6 +403,7 @@ export default {
     },
 
     openSelect() {
+      // console.log('=== 3. select 修改 - openSelect ===', this.value)
       if (!this.open) {
         this.getSelectFirst('', false)
       } else {
@@ -403,9 +411,11 @@ export default {
       }
     },
     selectOption() {
+      // console.log('=== 4. select 修改 - selectOption ===', this.value)
       this.open = false
     },
-    getSelectBlur () {
+    getSelectBlur (e) {
+      // console.log('=== 5. select 修改 - getSelectBlur ===', e, this.defaultVal, this.value)
       this.open = false
     }
   }

src/views/main/BookingLedger/detail/index.vue

@@ -44,6 +44,7 @@
                         :details="bookingDetails"
                         :rules="basicRules"
                         :inPageLoading="inPageLoading"
+                        isParent="parent"
                         @changeDetail="changeDetailFun"
                       ></basicInfo>
                       <!-- 收发通信息 -->
@@ -51,6 +52,7 @@
                         ref="mailingInfo"
                         :details="bookingDetails"
                         :rules="mailingRules"
+                        isParent="parent"
                         @changeDetail="changeDetailFun"
                         @spliceMore="spliceMorefun"
                         @pkgsEnCapital="pkgsEnCapitalFun"
@@ -61,6 +63,7 @@
                         :details="bookingDetails"
                         :rules="cargoRules"
                         :moreStr="moreStr"
+                        isParent="parent"
                         @changeDetail="changeDetailFun"
                       ></cargoInfo>
                       <!-- 签单信息 -->
@@ -68,6 +71,7 @@
                         ref="billInfo"
                         :details="bookingDetails"
                         :rules="billRules"
+                        isParent="parent"
                         @changeDetail="changeDetailFun"
                       ></billInfo>
                       <!-- 备注信息 -->
@@ -75,6 +79,7 @@
                         ref="remarksInfo"
                         :details="bookingDetails"
                         :rules="remarksRules"
+                        isParent="parent"
                         @changeDetail="changeDetailFun"
                       ></remarksInfo>
                       <!-- 箱型 -->
@@ -82,6 +87,7 @@
                         ref="goodsTable"
                         :details="bookingDetails"
                         :rules="tableRules"
+                        isParent="parent"
                         @changeDetail="changeDetailFun"
                         @changeTotal="changeTotalFun"
                         v-if="!inPageLoading"
@@ -94,6 +100,7 @@
                       class="pane-box"
                       :details="bookingDetails"
                       :rules="ediRules"
+                      isParent="parent"
                       @changeDetail="changeDetailFun"
                     ></ediMore>
                   </div>
@@ -138,8 +145,8 @@ import billInfo from './modules/billInfo'
 import remarksInfo from './modules/remarksInfo'
 import goodsTable from './modules/goodsTable'
 import rightContent from './modules/rightContent'
-import ediMore from './components/ediMore'
+import ediMore from './modules/ediMore'
-import sedOrder from './components/sedOrder'
+import sedOrder from './modules/sedOrder'
 
 import {
   BookingOrderGet,

src/views/main/BookingLedger/detail/modules/basicInfo.vue

@@ -489,9 +489,9 @@
 </template>
 <script>
 import { XCard } from '@/components'
-import inputView from './inputView'
+import inputView from '../components/inputView'
-import selectView from './selectView'
+import selectView from '../components/selectView'
-import datePickerView from './datePickerView'
+import datePickerView from '../components/datePickerView'
 
 import {
   DjyCustomerdetail,
@@ -533,6 +533,10 @@ export default {
     inSave: {
       type: Boolean,
       default: false
+    },
+    isParent: {
+      type: String,
+      default: ''
     }
   },
   data() {

src/views/main/BookingLedger/detail/modules/billInfo.vue

@@ -376,9 +376,9 @@
   </a-collapse>
 </template>
 <script>
-import inputView from './inputView'
+import inputView from '../components/inputView'
-import selectView from './selectView'
+import selectView from '../components/selectView'
-import datePickerView from './datePickerView'
+import datePickerView from '../components/datePickerView'
 
 export default {
   name: '',
@@ -403,6 +403,10 @@ export default {
     inSave: {
       type: Boolean,
       default: false
+    },
+    isParent: {
+      type: String,
+      default: ''
     }
   },
   data() {

src/views/main/BookingLedger/detail/modules/cargoInfo.vue

@@ -118,9 +118,9 @@
 </template>
 <script>
 
-import textareaView from './textareaView'
+import textareaView from '../components/textareaView'
-import selectView from './selectView'
+import selectView from '../components/selectView'
-import inputView from './inputView'
+import inputView from '../components/inputView'
 
 let timer;
 export default {
@@ -150,6 +150,10 @@ export default {
     inSave: {
       type: Boolean,
       default: false
+    },
+    isParent: {
+      type: String,
+      default: ''
     }
   },
   data() {

src/views/main/BookingLedger/detail/modules/ediMore.vue

@@ -429,7 +429,7 @@
   </div>
 </template>
 <script>
-import inputView from '../modules/inputView'
+import inputView from '../components/inputView'
 let timer;
 export default {
   components: {
@@ -451,6 +451,10 @@ export default {
     inSave: {
       type: Boolean,
       default: false
+    },
+    isParent: {
+      type: String,
+      default: ''
     }
   },
   data() {

src/views/main/BookingLedger/detail/modules/mailingInfo.vue

@@ -764,10 +764,10 @@
 </template>
 <script>
 import { XCard } from '@/components'
-import inputView from './inputView'
+import inputView from '../components/inputView'
-import textareaView from './textareaView'
+import textareaView from '../components/textareaView'
-import selectView from './selectView'
+import selectView from '../components/selectView'
-import datePickerView from './datePickerView'
+import datePickerView from '../components/datePickerView'
 import {
   BookingTemplateAdd
 } from '@/api/modular/main/BookingLedger'
@@ -797,6 +797,10 @@ export default {
     inSave: {
       type: Boolean,
       default: false
+    },
+    isParent: {
+      type: String,
+      default: ''
     }
   },
 

src/views/main/BookingLedger/detail/modules/remarksInfo.vue

@@ -38,6 +38,10 @@ export default {
     inSave: {
       type: Boolean,
       default: false
+    },
+    isParent: {
+      type: String,
+      default: ''
     }
   },
   data() {

src/views/main/BookingLedger/detail/modules/sedOrder.vue

@@ -58,6 +58,7 @@
                     :rules="basicRules"
                     :ishd="true"
                     :inSave="inSave"
+                    isParent="child"
                     @changeDetail="changeDetailFun"
                   ></basicInfo>
                   <!-- 收发通信息 -->
@@ -66,6 +67,7 @@
                     :details="editDetails"
                     :rules="mailingRules"
                     :inSave="inSave"
+                    isParent="child"
                     @changeDetail="changeDetailFun"
                     @pkgsEnCapital="pkgsEnCapitalFun"
                   ></mailingInfo>
@@ -75,6 +77,7 @@
                     :details="editDetails"
                     :rules="cargoRules"
                     :inSave="inSave"
+                    isParent="child"
                     @changeDetail="changeDetailFun"
                   ></cargoInfo>
                   <!-- 签单信息 -->
@@ -83,6 +86,7 @@
                     :details="editDetails"
                     :rules="billRules"
                     :inSave="inSave"
+                    isParent="child"
                     @changeDetail="changeDetailFun"
                   ></billInfo>
                   <!-- 备注信息 -->
@@ -91,6 +95,7 @@
                     :details="editDetails"
                     :rules="remarksRules"
                     :inSave="inSave"
+                    isParent="child"
                     @changeDetail="changeDetailFun"
                   ></remarksInfo>
                   <!-- 箱型 -->
@@ -99,6 +104,7 @@
                     :details="editDetails"
                     :rules="tableRules"
                     :inSave="inSave"
+                    isParent="child"
                     pType="secOrder"
                     @changeDetail="changeDetailFun"
                   ></goodsTable>
@@ -111,6 +117,7 @@
                   :rules="ediRules"
                   :details="editDetails"
                   :inSave="inSave"
+                  isParent="child"
                   @changeDetail="changeDetailFun"
                   v-if="!inPageLoading"
                 ></ediMore>
@@ -129,14 +136,13 @@
   </div>
 </template>
 <script>
-import sedOperationArea from '../modules/sedOperationArea'
+import sedOperationArea from './sedOperationArea'
-import basicInfo from '../modules/basicInfo'
+import basicInfo from './basicInfo'
-import mailingInfo from '../modules/mailingInfo'
+import mailingInfo from './mailingInfo'
-import cargoInfo from '../modules/cargoInfo'
+import cargoInfo from './cargoInfo'
-import billInfo from '../modules/billInfo'
+import billInfo from './billInfo'
-import remarksInfo from '../modules/remarksInfo'
+import remarksInfo from './remarksInfo'
-import goodsTable from '../modules/goodsTable'
+import goodsTable from './goodsTable'
-// import basicItem from './basicItem'
 import ediMore from './ediMore'
 import rules from '../rules'
 import { BookingOrderSave } from '@/api/modular/main/BookingLedger'
@@ -178,7 +184,6 @@ export default {
     billInfo,
     remarksInfo,
     goodsTable,
-    // basicItem,
     ediMore
   },
   data() {

src/views/main/BookingLedger/list/index.vue

@@ -229,6 +229,7 @@
       ref="setTableForm"
       :formData="formTableData"
       :formAllData="formMoreTableData"
+      :maxNum="30"
       type="table"
       @ok="submitTableForm"
       v-if="formMoreTableData"