前端孟祥旭

src/views/contractManagement/purchaseContract.vue

@@ -309,6 +309,7 @@ export default {
       showType: true,
       // 年
       year: '',
+      deliver_type: 1,
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
@@ -589,13 +590,29 @@ export default {
     // deletecontract(){},
     //删除
     handleDelete(row) {
-      var handleDelete = ' ' //sfdkd
-      if (row.handleDelete == '待执行' || row.handleDelete == '已完成') {
-        handleDelete = '执行中'
-      } else if (row.handleDelete == '执行中') {
-        handleDelete = '已完成'
-      }
-      this.$confirm(`合同删除后不可恢复，是否继续删除？`, '提示', {
+      console.log(row.deliverType,"sjkdsjkdj")
+      if (row.deliverType == 1 ) {
+        //删除对应的临时库提示框
+      this.$confirm('删除该合同将同时永久删除合同对应的临时库相关数据，是否确定删除？',{
+        confirmButtonText:'删除',
+        cancelButtonText: '取消',
+      })
+      .then(() => {
+          deletecontract({ id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '删除成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+            })
+            
+        })
+      } else {
+        this.$confirm(`合同删除后不可恢复，是否继续删除？`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
@@ -611,12 +628,14 @@ export default {
               this.getList()
             })
             .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+             
             })
         })
         .catch(() => {
           return false
         })
+      }
+      
     },
   },
 }

src/views/contractManagement/purchaseContractExamine.vue

@@ -52,32 +52,32 @@
         <ws-form-item label="卖方" span="1" prop="seller"
           >{{ deptBudgetList.seller }}
         </ws-form-item>
-        <ws-form-item label="货源地" span="1" prop="sourceGoods"
-          >{{ deptBudgetList.sourceGoods }}
+        <ws-form-item label="交货方式" span="1" prop="deliverType"
+          >{{ deptBudgetList.deliverType }}
         </ws-form-item>
         <ws-form-item label="买方电话" span="1" prop="buyerPhone"
           >{{ deptBudgetList.buyerPhone }}
         </ws-form-item>
-        <ws-form-item label="交货地" span="1" prop="placeDelivery">
-          {{ deptBudgetList.placeDelivery }}
+         <ws-form-item label="包装方式" span="1" prop="packingMethod">
+          {{ deptBudgetList.packingMethod }}
         </ws-form-item>
         <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
           {{ deptBudgetList.sellerPhone }}
         </ws-form-item>
-        <ws-form-item label="包装方式" span="1" prop="packingMethod">
-          {{ deptBudgetList.packingMethod }}
+        <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
+          {{ deptBudgetList.acceptanceMethod }}
         </ws-form-item>
         <ws-form-item label="重量（吨）" span="1" prop="weight">
           {{ deptBudgetList.weight }}
         </ws-form-item>
-        <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
-          {{ deptBudgetList.acceptanceMethod }}
+        <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
+          {{ deptBudgetList.deliveryDateStart }}
         </ws-form-item>
         <ws-form-item label="溢短装（%）" span="1" prop="overShort">
           {{ deptBudgetList.overShort }}
         </ws-form-item>
-        <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
-          {{ deptBudgetList.deliveryDateStart }}
+        <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
+          {{ deptBudgetList.deliveryDateEnd }}
         </ws-form-item>
         <ws-form-item
           label="合同单价（元/吨）"
@@ -86,15 +86,35 @@
         >
           {{ deptBudgetList.unitContractPrice }}
         </ws-form-item>
-        <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
-          {{ deptBudgetList.deliveryDateEnd }}
-        </ws-form-item>
         <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice">
           {{ deptBudgetList.totalContractPrice }}
         </ws-form-item>
+        <ws-form-item label="货源所在地区" span="1" >
+          {{deptBudgetList. sourceProvince}}
+          {{deptBudgetList.sourceCity}}
+          {{deptBudgetList.sourceArea}}
+
+        </ws-form-item>
+        <ws-form-item label="货源详细地址" span="1" prop="sourceGoods">
+          {{deptBudgetList.sourceGoods}}
+        </ws-form-item>
+        <ws-form-item label="交货地所在地区" span="1" >
+          {{deptBudgetList.deliveryProvince}}
+          {{deptBudgetList.deliveryCity}}
+          {{deptBudgetList. deliveryArea}}
+        </ws-form-item>
+        <ws-form-item label="交货地详细地址" span="1" prop=" placeDelivery">
+          {{deptBudgetList.placeDelivery}}
+        </ws-form-item>
         <ws-form-item label="签订日期" span="1" prop="signingDate">
           {{ deptBudgetList.signingDate }}
         </ws-form-item>
+        <ws-form-item label="最终实际交易量(吨)" span="1" prop="TradingVolume">
+          {{deptBudgetList.sourceRegion}}
+        </ws-form-item>
+        <ws-form-item label="临时库负责人" span="1" prop="sourceRegion">
+          {{deptBudgetList.sourceRegion}}
+        </ws-form-item>
       </ws-info-table>
       <!--面试信息-->
       <div class="remark">

src/views/contractManagement/salesContractExamine.vue

@@ -61,9 +61,9 @@
             </div>
             <span class="unchangeable">*</span>
           </ws-form-item>
-          <ws-form-item label="货源地" span="1" prop="sourceGoods">
+          <ws-form-item label="交货方式" span="1" prop="deliverType">
             <div class="unchanged">
-              {{ deptBudgetList.sourceGoods }}
+              {{ deptBudgetList.deliverType }}
             </div>
           </ws-form-item>
           <ws-form-item label="买方电话" span="1" prop="buyerPhone">
@@ -71,9 +71,9 @@
               {{ deptBudgetList.buyerPhone }}
             </div>
           </ws-form-item>
-          <ws-form-item label="交货地" span="1" prop="placeDelivery">
+          <ws-form-item label="包装方式" span="1" prop="packingMethod">
             <div class="unchanged">
-              {{ deptBudgetList.placeDelivery }}
+              {{ deptBudgetList.packingMethod }}
             </div>
           </ws-form-item>
           <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
@@ -81,9 +81,9 @@
               {{ deptBudgetList.sellerPhone }}
             </div>
           </ws-form-item>
-          <ws-form-item label="包装方式" span="1" prop="packingMethod">
+          <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
             <div class="unchanged">
-              {{ deptBudgetList.packingMethod }}
+              {{ deptBudgetList.acceptanceMethod }}
             </div>
           </ws-form-item>
           <ws-form-item label="重量（吨）" span="1" prop="weight">
@@ -91,9 +91,13 @@
               {{ deptBudgetList.weight }}
             </div>
           </ws-form-item>
-          <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
+         <ws-form-item
+            label="交货日期（起）"
+            span="1"
+            prop="deliveryDateStart"
+          >
             <div class="unchanged">
-              {{ deptBudgetList.acceptanceMethod }}
+              {{ deptBudgetList.deliveryDateStart }}
             </div>
           </ws-form-item>
           <ws-form-item label="溢短装（%）" span="1" prop="overShort">
@@ -101,13 +105,9 @@
               {{ deptBudgetList.overShort }}
             </div>
           </ws-form-item>
-          <ws-form-item
-            label="交货日期（起）"
-            span="1"
-            prop="deliveryDateStart"
-          >
+         <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
             <div class="unchanged">
-              {{ deptBudgetList.deliveryDateStart }}
+              {{ deptBudgetList.deliveryDateEnd }}
             </div>
           </ws-form-item>
           <ws-form-item
@@ -120,11 +120,7 @@
             </div>
             <span class="unchangeable">*</span>
           </ws-form-item>
-          <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
-            <div class="unchanged">
-              {{ deptBudgetList.deliveryDateEnd }}
-            </div>
-          </ws-form-item>
+          
           <ws-form-item
             label="合同总价（元）"
             span="1"
@@ -134,11 +130,47 @@
               {{ deptBudgetList.totalContractPrice }}
             </div>
           </ws-form-item>
+          
+          <ws-form-item label="货源所在地区" span="1" >
+            <div class="unchanged">
+                {{deptBudgetList. sourceProvince}}
+                {{deptBudgetList. sourceCity}}
+                {{deptBudgetList. sourceArea}}
+
+            </div>
+          </ws-form-item>
+          
+          <ws-form-item label="货源详细地址" span ="1" prop = "sourceGoods">
+            <div class = "unchanged">
+                {{deptBudgetList.sourceGoods}}
+            </div>
+          </ws-form-item>
+          
+          <ws-form-item label="交货地所在地区" span="1" >
+              <div class="unchanged">
+                  {{deptBudgetList. deliveryProvince}}
+                  {{deptBudgetList.deliveryCity}}
+                  {{deptBudgetList.deliveryArea}}
+              </div>
+          </ws-form-item>
+          
+          <ws-form-item label="交货地详细地址" span="1" prop="placeDelivery">
+            <div classs="unchanged">
+                {{deptBudgetList.placeDelivery}}
+            </div>
+
+          </ws-form-item>
           <ws-form-item label="签订日期" span="1" prop="signingDate">
             <div class="unchanged">
               {{ deptBudgetList.signingDate }}
             </div>
           </ws-form-item>
+          
+          <ws-form-item label="最终实际交易量 (吨)" span="1" prop="TradingVolume">
+            <div class="unchanged">
+              {{deptBudgetList.TradingVolume}}
+            </div>
+          </ws-form-item>
         </ws-info-table>
 
         <!-- </base-card> -->
@@ -322,6 +354,7 @@ export default {
       },
       mainReportAdd: {},
       list: {},
+      
     }
   },
 

src/views/tranManagement/tranManagementDriver.vue

@@ -397,6 +397,13 @@ export default {
     },
     //查找
     handleLook() {
+      if(this.value2){
+        this.startDate = this.dateFormat('YYYY-mm-dd',this.value2[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd',this.value2[1])
+      }else{
+        this.startDate = ''
+        this.endDate = ''
+      }
       this.currentPage = 1
       this.getList()
     },
@@ -560,7 +567,10 @@ export default {
         })
     },
     selecttaskType(e) {
-      this.selectedOptions = e
+      this.currentPage =1
+      this.getList()
+       
+      // this.selectedOptions = e
     },
     fujian(row) {
       if (

src/views/tranManagement/tranManagementDriverEdit.vue

@@ -593,6 +593,7 @@ export default {
           yearManufacture: '',
         },
       ],
+      addressUrls:{},
       freightspace1: [
         {
           accountTypeFlag: '1',

src/views/tranManagement/tranManagementVehicle.vue

@@ -378,33 +378,33 @@ export default {
       })
     },
     //记录
-    record(item) {
-      this.$router.push({
-        name: 'warehouseManagementRecord',
-        query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-        },
-        params: {
-          remark: item.remark,
-          binNumber: item.binNumber,
-          capacity: item.capacity,
-        },
-      })
-    },
+    // record(item) {
+    //   this.$router.push({
+    //     name: 'warehouseManagementRecord',
+    //     query: {
+    //       baseId: item.warehouseId,
+    //       positionId: item.binNumberId,
+    //       warehouseName: item.warehouseName,
+    //     },
+    //     params: {
+    //       remark: item.remark,
+    //       binNumber: item.binNumber,
+    //       capacity: item.capacity,
+    //     },
+    //   })
+    // },
     //盘损
-    loss(item) {
-      this.$router.push({
-        path: 'warehouseManagementIoss',
-        query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-          binNumber: item.binNumber,
-        },
-      })
-    },
+    // loss(item) {
+    //   this.$router.push({
+    //     path: 'warehouseManagementIoss',
+    //     query: {
+    //       baseId: item.warehouseId,
+    //       positionId: item.binNumberId,
+    //       warehouseName: item.warehouseName,
+    //       binNumber: item.binNumber,
+    //     },
+    //   })
+    // },
     //查看
     handleLook() {
       this.$router.push({ path: 'tranManagementVehicleLook' })

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -163,92 +163,73 @@
         </ws-info-table>
       </div>
       <div class="small-title"><h2>派车</h2></div>
-      <!-- <div class="inspector">
-        <!--自检员-->
-        <!-- <ws-form-item label="质检员" span="1" prop="qualityInspector">
-          <ws-input
-            v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
-            placeholder="请输入质检员姓名"
-            maxlength="120"
-            size="small"
-          />
-        </ws-form-item>
-      </div>  -->
-
       <div class="neifor">
         <ws-info-table>
           <!--司机-->
-          <ws-form-item label="司机" span="1" prop="waterContent">
-            <ws-select
-                v-model="deptBudgetList.waterContent"
-                placeholder="请选择司机"
-                @class="typeselect"
-                @change="selectwaterContent"
-            ></ws-select>
+          <ws-form-item label="司机" span="1" prop="waterContent" class="xia">
+            <ws-input
+              v-model="deptBudgetList.bulkDensity"
+              placeholder=""
+              maxlength="120"
+              size="small"
+              class="aa"
+              
+            />
           </ws-form-item>
           <!--司机电话-->
-          <ws-form-item label="司机电话" span="1" prop="impurity">
-            <ws-select
-                v-model="deptBudgetList.impurity"
-                placeholder="请选择司机司机电话"
-            ></ws-select>
+          <ws-form-item label="司机电话" span="1" prop="impurity" class="xia">
+            <ws-input
+              v-model="deptBudgetList.bulkDensity"
+              placeholder=""
+              maxlength="120"
+              size="small"
+              class="aa"
+              
+            />
           </ws-form-item>
           <!--车牌号-->
-          <ws-form-item label="车牌号" span="1" prop="bulkDensity">
+          <ws-form-item label="车牌号" span="1" prop="bulkDensity" class="xia">
             <ws-input
               v-model="deptBudgetList.bulkDensity"
               placeholder=""
               maxlength="120"
               size="small"
+              class="aa"
+              
             />
           </ws-form-item>
           <!--车型-->
-          <ws-form-item label="车型" span="1" prop="mildewGrain">
+          <ws-form-item label="车型" span="1" prop="mildewGrain" class="xia">
             <ws-input
               v-model="deptBudgetList.mildewGrain"
               placeholder="请输入高栏"
               maxlength="120"
               size="small"
+              class="aa"
             />
           </ws-form-item>
           <!--车长-->
-          <ws-form-item label="车长" span="1" prop="jiaorenli">
+          <ws-form-item label="车长" span="1" prop="jiaorenli" class="xia">
             <ws-input
               v-model="deptBudgetList.jiaorenli"
               placeholder="请输入车长"
               maxlength="120"
               size="small"
+              class="aa"
             />
           </ws-form-item>
           <!--载重吨-->
-          <ws-form-item label="载重（吨）" span="1" prop="imperfectGrain">
+          <ws-form-item label="载重（吨）" span="1" prop="imperfectGrain" class="xia">
             <ws-input
               v-model="deptBudgetList.warehouseInOutDetail.imperfectGrain"
               placeholder="请输入载重（吨）"
               maxlength="120"
               size="small"
+              class="aa"
             />
-            
           </ws-form-item>
-          
-        </ws-info-table>
-        <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del(index)"
-            src="../../../public/img/del.png"
-            alt=""
-          />
+        </ws-info-table> 
       </div>
-      
-      <el-button
-          class="add"
-          type="primary"
-          size="small"
-          @click="add1"
-          >添加司机</el-button
-        >
       <div style="text-align: right; padding: 10px">
         
         <el-button
@@ -372,10 +353,10 @@ export default {
     revert() {
       this.$router.push({ path: 'tranManagementVehicle' })
     },
-    del(index){
-        if(this.freightspace.length > 1 ){
-            this.freightspace.splice(index,1)
-        }
+    del(index) {
+      if (this.freightspace.length > 1) {
+        this.freightspace.splice(index, 1)
+      }
     },
     //提交按钮
     submit() {
@@ -865,11 +846,6 @@ padding: 2px 4px;
   color: #8890b1;
   line-height: 16px;
 }
-//质检员
-.inspector .el-form-item__content {
-  text-align: left;
-  margin-left: 0px;
-}
 .small-title {
   position: relative;
   padding: 10px;
@@ -886,9 +862,9 @@ padding: 2px 4px;
   top: 13px;
   padding: 4px 2px;
 }
-//下面列表
+// 下面列表
 .neifor {
-  width: 80%;
+  width: 90%;
   background-color: #f6f7fc;
 }
 /deep/.neifor .ws-info-table .el-form-item .el-form-item__label {
@@ -903,7 +879,12 @@ padding: 2px 4px;
 /deep/.neifor .el-input--small .el-input__inner{
   width: 100%;
 }
-.ws-info-table[data-v-850a44a6] .el-form-item {
-    width: 16.66%;
+// .ws-info-table[data-v-850a44a6] .el-form-item {
+//     width: 16.66%;
+// }
+.xia {
+   
+    width: 16%;
 }
+
 </style>

vue.config.js

@@ -144,7 +144,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.119:8090/',
+        target: 'http://192.168.1.124:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',