物流单、竞争对手调整

src/HDrpManagement/competitor/detail/index.vue

@@ -10,6 +10,7 @@
         idname="sa_competitorid"
         typeTask="竞争对手"
         :tags="[]"
+        column="4"
         :tabs="['详细信息','参与竞争项目','联系人','地址管理']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">

src/HDrpManagement/logistics/modules/add.vue

@@ -98,19 +98,19 @@ export default {
       visible:false,
       setcol:24,
       form:{
-        "freightamount": "",
-        "logisticno": "",
-        "paytype": "",
-        "remarks": "",
-        "sa_dispatchids": [],
-        "sa_logiscompid": 0,
-        "sa_logisticsid": 0,
-        "sys_enterpriseid": '',
-        "carnum":"",
-        "logisphone":"",
-        "logiscontact":"",
-        "rec_contactsid":'',
-        billdate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`
+        "freightamount": "",
+        "logisticno": "",
+        "paytype": "",
+        "remarks": "",
+        "sa_dispatchids": [],
+        "sa_logiscompid": 0,
+        "sa_logisticsid": 0,
+        "sys_enterpriseid": '',
+        "carnum":"",
+        "logisphone":"",
+        "logiscontact":"",
+        "rec_contactsid":'',
+        'billdate':`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`
       },
       rules:{
         point:[
@@ -169,7 +169,21 @@ export default {
         this.drawer = false
         this.dialogAddress = false
         this.$emit('onSuccess')
-        this.form = {}
+        this.form = {
+          "freightamount": "",
+          "logisticno": "",
+          "paytype": "",
+          "remarks": "",
+          "sa_dispatchids": [],
+          "sa_logiscompid": 0,
+          "sa_logisticsid": 0,
+          "sys_enterpriseid": '',
+          "carnum":"",
+          "logisphone":"",
+          "logiscontact":"",
+          "rec_contactsid":'',
+          'billdate':`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`
+        }
         this.$refs.dislist.tableData = []
        /* this.$router.push({path:'/logisticsdetail',query:{id:res.data.sa_logisticsid,rowindex:res.data.rowindex}})*/
         this.$store.dispatch('changeDetailDrawer',true)

src/HDrpManagement/logistics/modules/edit.vue

@@ -28,8 +28,8 @@ ed<template>
               value="到付">
             </el-option>
             <el-option
-              label="寄付"
-              value="寄付">
+              label="预付"
+              value="预付">
             </el-option>
           </el-select>
         </el-form-item>
@@ -117,18 +117,18 @@ export default {
       setcol:24,
       form:{
        "freightamount": "",
-        "logisticno": "",
-        "paytype": "",
-        "remarks": "",
-        "sa_dispatchids": [],
-        "sa_logiscompid": 0,
-        "sa_logisticsid": 0,
-        "sys_enterpriseid": '',
-        "carnum":"",
-        "logisphone":"",
-        "logiscontact":"",
-        "rec_contactsid":'',
-        billdate:''
+        "logisticno": "",
+        "paytype": "",
+        "remarks": "",
+        "sa_dispatchids": [],
+        "sa_logiscompid": 0,
+        "sa_logisticsid": 0,
+        "sys_enterpriseid": '',
+        "carnum":"",
+        "logisphone":"",
+         "logiscontact":"",
+        "rec_contactsid":'',
+        "billdate":''
       },
       enterpriseInfo:null,
        pickerOptions: {
@@ -146,7 +146,7 @@ export default {
         this.$refs['ent'].form.enterprisename = this.data.enterprisename
         this.$refs['logis'].form.abbreviation = this.data.logiscomp_enterprisename
       })
-     
+
     },
     addMoreBill () {
       if (this.enterpriseInfo === null) return this.$message({
@@ -184,7 +184,21 @@ export default {
       this.tool.showMessage(res,()=>{
         this.drawer = false
         this.$emit('onSuccess')
-        this.form = {}
+        this.form = {
+          "freightamount": "",
+          "logisticno": "",
+          "paytype": "",
+          "remarks": "",
+          "sa_dispatchids": [],
+          "sa_logiscompid": 0,
+          "sa_logisticsid": 0,
+          "sys_enterpriseid": '',
+          "carnum":"",
+          "logisphone":"",
+          "logiscontact":"",
+          "rec_contactsid":'',
+          "billdate":''
+        }
       })
     },
     onClose () {
@@ -193,4 +207,4 @@ export default {
     }
   }
 }
-</script>
+</script>

src/components/normal-basic-layout/details/index.vue

@@ -32,7 +32,7 @@
         <slot name="d_head"></slot>
       </div>
       <div v-show="isTop">
-        <el-descriptions :column="5" size="mini">
+        <el-descriptions :column="column?column:5" size="mini">
           <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" v-for="item in mainAData" :key="item.index" :label="item.label">
             <span v-if="item.label === '关联应用数据'"  :style="item.style?item.style():''">
               <span v-if="item.value !== ''">
@@ -101,7 +101,7 @@ import taskTemp from './modules/task/index.vue'
 import reportCenter from '../reportCenter/index'
 import {mapGetters} from 'vuex'
 export default {
-  props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','pageChange','justsaler','mainData','status','typeTask','isGroup','isBatch','modelName','isDelete'],
+  props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','pageChange','justsaler','mainData','status','typeTask','isGroup','isBatch','modelName','isDelete','column'],
   data () {
     return {
       isTop:true,