Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

src/layout/components/Sidebar/index.vue

@@ -1,8 +1,7 @@
 <template>
     <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
-
+      <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper" >
-        <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper" >
+        <div style="margin-bottom:300px" >
-        <div >
             <logo :collapse="isCollapse" />
             <biz-nav id="bizNav"  v-if="this.sidebar.opened" style="padding: 0px 0px;width:100%"/>
             <el-menu
@@ -26,7 +25,7 @@
               <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
             </div>
         </div>
-        </el-scrollbar>
+      </el-scrollbar>
     </div>
 </template>
 

src/views/emis/emisProblemType/index.vue

@@ -54,7 +54,7 @@
 
    
 
-       <xd-table 
+       <XdTable 
          slot="pageContent"
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
@@ -174,7 +174,7 @@
           >删除</el-button> -->
         </template>
       </el-table-column>
-    </xd-table>
+    </XdTable>
 
 
     <!-- 添加或修改问题件类型对话框 -->

src/views/emis/emisTmsTransPlan/emisTmsTransPlanForm.vue

@@ -16,9 +16,7 @@
               </el-col>
               <el-col :span="24">
                   <el-form-item label="产品类型" prop="productType">
-                    <!-- :transLineCode="form.transLineType" -->
                     <TransProductMultiplePicker placeholder="产品类型" v-model="form.productType" :transLineCode="form.transLineType"></TransProductMultiplePicker>
-                    <!-- <TransProductPicker placeholder="产品类型" v-model="form.productType" :transLineCode="form.transLineType"></TransProductPicker> -->
                   </el-form-item>
               </el-col>
 
@@ -30,16 +28,11 @@
                     </el-radio-group>
                   </el-form-item>
                 </el-col>
-              <!-- <el-col :span="24">
+             
-                  <el-form-item label="备注" prop="remark">
-                    <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                  </el-form-item>
-              </el-col> -->
             </el-row>
 
           </el-col>
           <el-col :span="14">
-            <!-- <el-divider content-position="left">运输节点</el-divider> -->
             <el-row>
               <el-col :span="24" :xs="24" style="padding: 10px;">
                 <el-row>
@@ -48,7 +41,6 @@
                   </el-col>
                   <el-col :span="24">
 
-
                   </el-col>
                 </el-row>
               </el-col>
@@ -56,15 +48,6 @@
           </el-col>
 
           <el-col :span="5" style="border-left: 1px solid #efefef;">
-            <!-- <XdSteps
-                  :currentStep="3"
-                  :totalSteps="5"
-                  :stepsLabel="stepsLabel"
-                  :stepsDesc="stepsDesc"
-                  :totalWidth="900"
-                  :descMaxWidth="160"
-                  @change="onStepChange" /> -->
-                  <!-- direction="vertical" :active="1" -->
                   <div style="height: 300px;padding: 40px;">
                       <el-steps direction="vertical" :active="1" align-center finish-status="success">
                         <el-step v-for="item in form.stepList"   :key="item.orderNum" :title="item.stepName" >

src/views/emis/emisTmsTransPlan/planDtlPanel.vue

@@ -65,7 +65,7 @@
 
                 <!-- @click="handleDelete(scope.row)" -->
     <!-- 添加或修改费用计算表达式对话框 -->
-    <el-dialog :title="title"  :visible.sync="open" width="50%" :close-on-click-modal="false" v-dialogDrag  append-to-body>
+    <el-dialog :title="title"  :visible.sync="open" width="50%" :close-on-click-modal="false" :destroy-on-close="true" v-dialogDrag  append-to-body>
       <el-row :gutter="0">
         <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
           <el-col :span="24">
@@ -223,11 +223,11 @@ export default {
   methods: {
     initData() {
       this.reset();
-       if(this.planId!=null){
+      if(this.planId!=null){
-          this.getList();
+        this.getList();
-       }else{
+      }else{
-          this.emisTmsTransPlanDtlList=[];
+        this.emisTmsTransPlanDtlList=[];
-       }
+      }
    },
    // 选择网点
    handleSelectSite(){
@@ -316,7 +316,8 @@ export default {
       this.title = "新增节点";
       const orderNum=this.emisTmsTransPlanDtlList.length+1;
       this.form.orderNum=orderNum;
-      if(orderNum>1){
+      this.form.destSiteCode=null;
+      // if(orderNum>1){
         // 获取上一条数据
         // const [lastData]= this.emisTmsTransPlanDtlList.slice(-1);
         // console.log(lastData);
@@ -324,7 +325,7 @@ export default {
         // this.form.destSiteCode=null;
         // this.form.transType=lastData.transType;
         // this.form.estCostDay=1;
-      }
+      // }
 
     },