浏览代码

前端sdy

zhongtianhaoyuan 4 年之前
父节点
当前提交
1ed7b2fedf

+ 3 - 5
src/views/contractManagement/purchaseContractExamine.vue

@@ -159,8 +159,9 @@
         <h3>流程信息</h3>
       </div>
       <ws-info-table>
-        <ws-form-item label="合同收入(元)" span="1" prop="goodsNameKey">
-          {{ deptBudgetList.contractProcessInfo.goodsNameKey }}
+         <!--已付款(元)-->
+        <ws-form-item label="已付款(元)" span="1" prop="goodsNameKey">
+          {{deptBudgetList.contractProcessInfo.goodsNameKey}}
         </ws-form-item>
         <ws-form-item label="已开发票(元)" span="1" prop="goodsName">
           {{ deptBudgetList.contractProcessInfo.goodsName }}
@@ -171,9 +172,6 @@
         <ws-form-item label="未开发票(元)" span="1" prop="impurity"
           >{{ deptBudgetList.contractProcessInfo.impurity }}
         </ws-form-item>
-        <ws-form-item label="未回款(元)" span="1" prop="mildewGrain"
-          >{{ deptBudgetList.contractProcessInfo.mildewGrain }}
-        </ws-form-item>
         <ws-form-item
           label="已完成发运量(吨)"
           span="1"

+ 6 - 3
src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -67,7 +67,8 @@
           {{ deptBudgetList.predictDate }}
         </ws-form-item>
         <!--货物信息-->
-        <span style="line-height: 50px; margin-left: 16px; color: #8890b1"
+        
+        <span style="line-height: 50px; text-align: center; color: #8890b1"
           >货物信息</span
         >
         <!-- <ws-form-item label="货物信息" span="1" prop="sendDetailedAddress">
@@ -78,7 +79,7 @@
         <el-input placeholder="请输入内容" :disabled="true"> </el-input>
         <el-input placeholder="请输入内容" :disabled="true"> </el-input>
         <el-input placeholder="请输入内容" :disabled="true"> </el-input>
-        <span style="line-height: 40px; margin-left: 16px; color: #8890b1"
+        <span style="line-height: 40px; text-align: center; color: #8890b1"
           >业务描述</span
         >
         <!--业务描述-->
@@ -89,6 +90,7 @@
           placeholder="请输入备注信息,不超过200字"
           maxlength="200"
         />
+        
       </ws-info-table>
 
       <div class="small-title" style="font-size: 16px">实际流转数量</div>
@@ -785,7 +787,7 @@ export default {
 }
 //输入框
 /deep/.el-input {
-  width: 14.6%;
+  width: 15%;
   margin-left: 10px;
 }
 /deep/.is-disabled .el-input__inner {
@@ -796,6 +798,7 @@ export default {
 .line {
   width: 100%;
 }
+
 //业务描述
 /deep/.el-textarea {
   width: 90%;

+ 1 - 1
src/views/taskManagement/tranManagementTransportAdd.vue

@@ -183,7 +183,7 @@
           ></el-input>
         </el-form-item>
         <div class="check-box">
-          <span class="check-box" >运输方式</span>
+          <span class="check-box">运输方式</span>
           <el-checkbox-group v-model="checkList" prop="tranType">
             <el-checkbox label="汽运"></el-checkbox>
             <el-checkbox label="火运"></el-checkbox>

+ 5 - 5
src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -77,7 +77,7 @@
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="状态">
+        <el-table-column prop="processStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -89,15 +89,15 @@
               <template>
                 <span slot="reference">
                   <span
-                    v-if="scope.row.status == '待执行'"
+                    v-if="scope.row.processStatus == '待执行'"
                     class="executory"
                   ></span>
                   <span
-                    v-if="scope.row.status == '执行中'"
+                    v-if="scope.row.processStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span
-                  >{{ scope.row.status }}
+                  <span v-if="scope.row.processStatus == '已完成'" class="done"></span
+                  >{{ scope.row.processStatus }}
                 </span>
               </template>
               <div>

+ 29 - 43
src/views/tranManagement/tranManagementVehicle.vue

@@ -7,27 +7,13 @@
           执行中</ws-button
         >
         <ws-button class="but" :type="status1==1?'primary':''" @click="changestatus(2)">已完成</ws-button>
-        <ws-button class="but" :type="status2==1?'primary':''" @click="changestatus(1)">全部任务</ws-button>
+        <ws-button class="but" :type="status2==1?'primary':''" @click="changestatus()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
         <div>
           <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
         </div>
-        
-        <!-- <ws-date-picker
-          v-model="deptBudgetList.inOutDate"
-          type="date"
-          placeholder="请选择开始日期"
-          value-format="yyyy-MM-dd"
-        />
-        <span>至</span>
-        <ws-date-picker
-          v-model="deptBudgetList.inOutDate"
-          type="date"
-          placeholder="请选择结束日期"
-          value-format="yyyy-MM-dd"
-        /> -->
         <el-date-picker
           v-model="deptBudgetList.inOutDate"
           type="daterange"
@@ -87,7 +73,7 @@
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="状态">
+        <el-table-column prop="processStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -99,15 +85,15 @@
               <template>
                 <span slot="reference">
                   <span
-                    v-if="scope.row.status == '待执行'"
+                    v-if="scope.row.processStatus == '待执行'"
                     class="executory"
                   ></span>
                   <span
-                    v-if="scope.row.status == '执行中'"
+                    v-if="scope.row.processStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span
-                  >{{ scope.row.status }}
+                  <span v-if="scope.row.processStatus == '已完成'" class="done"></span
+                  >{{ scope.row.processStatus }}
                 </span>
               </template>
               <div>
@@ -419,29 +405,29 @@ export default {
       this.currentPage = 1
       this.getList()
     },
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          contractType: this.contractType,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize,
-          searchType: this.searchType,
-          searchKeyWord: this.searchKeyWord,
-          startDate: this.startDate,
-          endDate: this.endDate,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
-        type: 'xls',
-      })
-    },
+    // async exportlist() {
+    //   const { data } = await export1(
+    //     {
+    //       compId: sessionStorage.getItem('ws-pf_compId'),
+    //       contractType: this.contractType,
+    //       currentPage: this.currentPage,
+    //       pageSize: this.pageSize,
+    //       searchType: this.searchType,
+    //       searchKeyWord: this.searchKeyWord,
+    //       startDate: this.startDate,
+    //       endDate: this.endDate,
+    //     },
+    //     {},
+    //     { responseType: 'blob' }
+    //   ).toPromise()
+    //   downloadFile({
+    //     res: data,
+    //     fileName: `${
+    //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
+    //     }_采购合同`,
+    //     type: 'xls',
+    //   })
+    // },
   },
 }
 </script>