gjy 4 lat temu
rodzic
commit
0bddc48441

BIN
public/img/icons/apple-touch-icon-152x152.png


BIN
public/img/icons/favicon-16x16.png


BIN
public/img/icons/favicon-32x32.png


BIN
public/img/icons/winseaLogo-152x152.png


BIN
public/img/icons/winseaLogo-33x33.png


BIN
public/img/icons/winseaLogo_144x144.png


BIN
public/img/icons/winseaLogo_16x16.png


+ 1 - 7
public/index.html

@@ -16,9 +16,6 @@
   <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
   <link rel="manifest" href="<%= BASE_URL %>/manifest.json" />
   <link rel="icon" href="<%= BASE_URL %>/logo.ico">
-  <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV]) { %>
-      <link href="<%= htmlWebpackPlugin.options.cdn.css[process.env.VUE_APP_PACKAGE_ENV][i] %>" rel="stylesheet">
-  <% } %>
   <title>易粮易运</title>
   <link rel="icon" href="<%= BASE_URL %>/logo.ico">
   <% if (process.env.NODE_ENV === 'production') { %>
@@ -107,10 +104,7 @@
       </div>
     </div>
   </div>
-  <!-- built files will be auto injected -->
-  <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.js[process.env.VUE_APP_PACKAGE_ENV]) { %>
-      <script src="<%= htmlWebpackPlugin.options.cdn.js[process.env.VUE_APP_PACKAGE_ENV][i] %>" charset="utf-8"></script>
-  <% } %>
+
 </body>
 
 </html>

+ 25 - 16
src/views/taskManagement/tranManagementTransportAdd.vue

@@ -81,6 +81,7 @@
         </el-form-item>
         <el-form-item label="重量(吨)" span="1" prop="weight">
           <el-input
+          @input='weightchange'
             v-model="deptBudgetList.weight"
             placeholder="请输入重量"
             maxlength="20"
@@ -199,12 +200,12 @@
         :key="index"
       >
         <div class="driver">
-          <span >运输阶段{{ index + 1 }} {{ item.processNo }}</span>
-          <img
+          <span style='vertical-align: top;'>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
+          <img v-if='!endflag'
             width="22"
             height="22"
             class="add"
-            @click="add"
+            @click="add(index)"
             src="../../../public/img/add.png"
             alt=""
           />
@@ -216,19 +217,14 @@
             src="../../../public/img/del.png"
             alt=""
           />
-          <span style="margin-left : 20px;font-size : 14px"  v-if="index == deptBudgetList.tranProcessInfoList.length - 1">最终阶段</span>
           <el-checkbox
+          @change='engflagchange'
+           class='endflag'
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
             v-model="item.endFlag"
             :label="1"
-            ></el-checkbox
-          >  
-          <el-checkbox
-            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
-            v-model="item.endFlag"
-            :label="2"
-            ></el-checkbox
-          >        
+            >最终阶段</el-checkbox
+          >     
         </div>
         <ws-info-table>
           <el-form-item label="运输方式" span="1" prop="waterContent">
@@ -411,7 +407,7 @@ export default {
             tranTypeKey: '1',
             deliveryDateStart: '',
             deliveryDateEnd: '',
-            weight: '13',
+            weight: '',
             selectedOptions: [],
             selectedOptions1: [],
             sendPrivate: '',
@@ -434,6 +430,7 @@ export default {
       options_: regionData,
       heightData: '600px',
       zoom: 7,
+      endflag:false,
       selectedOptions: [],
       selectedOptions1: [],
       window: '',
@@ -473,6 +470,12 @@ export default {
     },
   },
   methods: {
+    weightchange(e){
+      this.deptBudgetList.tranProcessInfoList[0].weight=e
+    },
+    engflagchange(e){
+      this.endflag=e
+    },
     // 获取当前年月日
     getdate() {
       var date = new Date()
@@ -504,6 +507,7 @@ export default {
     },
     loaddata() {
       this.deptBudgetList.taskNo = 'YS' + this.getdate() + this.verifyinit()
+      this.deptBudgetList.tranProcessInfoList[0].processNo=this.deptBudgetList.taskNo+'-1'
       // 货名
       packList({ constId: 'CON2' })
         .toPromise()
@@ -547,13 +551,15 @@ export default {
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-    add() {
+    add(index) {
+      console.log(index)
       this.deptBudgetList.tranProcessInfoList.push({
+        processNo: this.deptBudgetList.taskNo+'-'+(index+2),
         tranType: '汽运',
         tranTypeKey: '1',
         deliveryDateStart: '',
         deliveryDateEnd: '',
-        weight: '13',
+        weight: this.deptBudgetList.tranProcessInfoList[this.deptBudgetList.tranProcessInfoList.length-1].weight,
         selectedOptions: [],
         selectedOptions1: [],
         sendPrivate: '',
@@ -649,6 +655,7 @@ export default {
           }
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
           this.deptBudgetList.tranType = this.checkList.toString()
+          console.log(this.deptBudgetList)
           addtrantask(this.deptBudgetList)
             .toPromise()
             .then((response) => {
@@ -773,7 +780,9 @@ export default {
 .el-form {
   margin-top: 50px;
 }
-
+.endflag{
+  vertical-align: top;
+}
 .el-col {
   background: #f6f7fc;
 }

+ 1 - 1
vue.config.js

@@ -143,7 +143,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.116:8090/',
+        target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',