前端孟祥旭

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -1,56 +1,57 @@
 <!--出入库任务-->
 <template>
-   <div class="container">
-      <div class="nav">
-        <ws-button class="butt" type="primary" @click="handleAdd()"
+  <div class="container">
+    <div class="nav">
+      <ws-button
+        class="butt"
+        type="primary"
+        @click="handleAdd()"
         v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfoTask.add`
           "
-          ><img
-            width="13"
-            height="13"
-            style="
+      >
+        <img
+          width="13"
+          height="13"
+          style="
               vertical-align: text-top;
               position: relative;
               top: 2px;
               left: -4px;
             "
-            src="../../../public/img/header-add.png"
-            alt=""
-          />添加</ws-button
-        >
-        <ws-input
-          v-model="warehouseName"
-          placeholder="可按合同编号或任务编号查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="Value"
-        ></ws-input> 
-          <ws-button class="find" type="primary" @click="lookUp()"
-            ><img
-              width="16"
-              height="16"
-              style="
+          src="../../../public/img/header-add.png"
+          alt
+        />添加
+      </ws-button>
+      <ws-button class="but" :type="primary == 1 ? 'primary' : ''" @click="handlestatus(1)">待审核</ws-button>
+      <ws-button class="but" :type="primary == 2 ? 'primary' : ''" @click="handlestatus(2)">已驳回</ws-button>
+      <ws-button class="but" :type="primary == 3 ? 'primary' : ''" @click="handlestatus(3)">执行中</ws-button>
+      <ws-button class="but" :type="primary == 4 ? 'primary' : ''" @click="handlestatus(4)">已完成</ws-button>
+      <ws-button class="but" :type="primary == 5 ? 'primary' : ''" @click="handlestatus('')">全部任务</ws-button>
+      <ws-input
+        v-model="warehouseName"
+        placeholder="可按合同编号或任务编号查找"
+        clearable
+        maxlength="500"
+        type="input"
+        class="Value"
+      ></ws-input>
+      <ws-button class="find" type="primary" @click="lookUp()">
+        <img
+          width="16"
+          height="16"
+          style="
                 vertical-align: text-top;
                 position: relative;
                 top: 0px;
                 left: -1px;
               "
-              src="../../../public/img/sousuo.png"
-              alt=""
-          /></ws-button> 
-      </div>
+          src="../../../public/img/sousuo.png"
+          alt
+        />
+      </ws-button>
+    </div>
     <div class="navv">
-        <ws-button class="but" :type="primary == 1 ? 'primary' : ''"  @click="handlestatus(1)">
-          待审核</ws-button>
-          <ws-button class="but" :type="primary == 2 ? 'primary' : ''" @click="handlestatus(2)">
-          已驳回</ws-button>
-        <ws-button class="but" :type="primary == 3 ? 'primary' : ''"  @click="handlestatus(3)">
-          执行中</ws-button
-        >
-        <ws-button class="but" :type="primary == 4 ? 'primary' : ''" @click="handlestatus(4)">已完成</ws-button>
-        <ws-button class="but" :type="primary == 5 ? 'primary' : ''" @click="handlestatus('')">全部任务</ws-button>
       <el-table
         class="wenzi"
         :data="gainList.records"
@@ -63,21 +64,14 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="contractNo" label="合同编号" width="80">
-        </el-table-column>
-        <el-table-column prop="inOutTaskNo" label="任务编号"> </el-table-column>
-        <el-table-column prop="warehouseName" class="table_td" label="库房名">
-        </el-table-column>
-        <el-table-column prop="inOutType" class="table_td" label="出入库类型">
-        </el-table-column>
-        <el-table-column prop="goodsName" class="table_td" label="货名">
-        </el-table-column>
-        <el-table-column prop="weight" class="table_td" label="重量（吨）">
-        </el-table-column>
-        <el-table-column prop="predictDate" class="table_td" label="预计日期">
-        </el-table-column>
-        <el-table-column prop="publisher" class="table_td" label="发布者">
-        </el-table-column>
+        <el-table-column prop="contractNo" label="合同编号" width="80"></el-table-column>
+        <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
+        <el-table-column prop="warehouseName" class="table_td" label="库房名"></el-table-column>
+        <el-table-column prop="inOutType" class="table_td" label="出入库类型"></el-table-column>
+        <el-table-column prop="goodsName" class="table_td" label="货名"></el-table-column>
+        <el-table-column prop="weight" class="table_td" label="重量（吨）"></el-table-column>
+        <el-table-column prop="predictDate" class="table_td" label="预计日期"></el-table-column>
+        <el-table-column prop="publisher" class="table_td" label="发布者"></el-table-column>
         <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
@@ -89,36 +83,24 @@
             >
               <template>
                 <span slot="reference">
-                  <span
-                    v-if="scope.row.taskStatus == '待审核'"
-                    class="executory"
-                  ></span>
-                  <span
-                    v-if="scope.row.taskStatus == '执行中'"
-                    class="inExecution"
-                  ></span>
-                  <span
-                    v-if="scope.row.taskStatus == '已完成'"
-                    class="done"
-                  ></span
-                  >{{ scope.row.taskStatus }}
+                  <span v-if="scope.row.taskStatus == '待审核'" class="executory"></span>
+                  <span v-if="scope.row.taskStatus == '执行中'" class="inExecution"></span>
+                  <span v-if="scope.row.taskStatus == '已完成'" class="done"></span>
+                  {{ scope.row.taskStatus }}
                 </span>
               </template>
               <div>
                 <p style="margin-top: 0; padding-left: 10px">操作历史</p>
                 <div v-for="(item, index) in historyList" class="flex">
-                  <div class="vertical-text vertical-text-left">
-                    {{ item.updateDate }}
-                  </div>
+                  <div class="vertical-text vertical-text-left">{{ item.updateDate }}</div>
                   <div>
                     <div class="vertical-circle"></div>
-                    <div
-                      v-if="index != historyList.length - 1"
-                      class="vertical-line"
-                    ></div>
+                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
                   </div>
                   <div class="vertical-text">
-                    {{ item.operateUser }}<br />{{ item.dealMsg }}
+                    {{ item.operateUser }}
+                    <br />
+                    {{ item.dealMsg }}
                   </div>
                 </div>
               </div>
@@ -129,31 +111,30 @@
               style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png"
               @click="editClick(scope.row)"
-              alt=""
+              alt
             />
           </template>
         </el-table-column>
-        <el-table-column prop="establishDate" class="table_td" label="创建时间">
-        </el-table-column>
+        <el-table-column prop="establishDate" class="table_td" label="创建时间"></el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <div class="record" @click="nocomplete(scope.row)" v-hasPermission="
+            <div
+              class="record"
+              @click="nocomplete(scope.row)"
+              v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfoTask.view`
-          ">
-              查看
-            </div>
+          "
+            >查看</div>
             <div
-            v-hasPermission="
+              v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfoTask.audit`
           "
               v-if="scope.row.taskStatus == '待审核'"
               class="adjustment"
               @click="delivery(scope.row)"
-            >
-              审核
-            </div>
+            >审核</div>
             <div
-            v-hasPermission="
+              v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfoTask.edit`
           "
               v-if="
@@ -162,11 +143,9 @@
               "
               class="record"
               @click="delivery(scope.row)"
-            >
-              编辑
-            </div>
+            >编辑</div>
             <div
-            v-hasPermission="
+              v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfoTask.delete`
           "
               v-if="
@@ -175,9 +154,7 @@
               "
               class="adjustment"
               @click="deleteclick(scope.row)"
-            >
-              删除
-            </div>
+            >删除</div>
           </template>
         </el-table-column>
       </el-table>
@@ -188,8 +165,7 @@
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal"
-      >
-      </el-pagination>
+      ></el-pagination>
     </div>
   </div>
 </template>
@@ -203,7 +179,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     vesselId(val) {
@@ -211,7 +187,7 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
@@ -229,7 +205,7 @@ export default {
       year: '',
       gainList: [],
       currentPage: 1,
-      primary:'1',
+      primary: '1',
       pageSize: 10,
       searchType: 1,
       searchTypeText: '未完成',
@@ -245,11 +221,11 @@ export default {
       deptCircularPage: {},
       historyList: [],
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   activated() {
@@ -280,17 +256,17 @@ export default {
       this.$confirm(text, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
           console.log(row)
           outdelete({
             id: row.id,
             relevanceId: row.relevanceId,
-            inOutFlag:row.inOutFlag
+            inOutFlag: row.inOutFlag
           })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.getList()
             })
         })
@@ -304,10 +280,10 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
+        searchKeyWord: this.searchKeyWord
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           console.log(response)
           this.gainList = response
           this.currentPage = response.current
@@ -320,9 +296,9 @@ export default {
         this.primary = 1
       } else if (status == 2) {
         this.primary = 2
-      }else if (status == 3) {
+      } else if (status == 3) {
         this.primary = 3
-      }else if (status == 4) {
+      } else if (status == 4) {
         this.primary = 4
       } else {
         this.primary = 5
@@ -335,8 +311,8 @@ export default {
       this.$router.push({
         path: 'tranManagementWarehouseInOutTaskEdit',
         query: {
-          relevanceId: item.relevanceId,
-        },
+          relevanceId: item.relevanceId
+        }
       })
     },
 
@@ -376,8 +352,8 @@ export default {
       this.$router.push({
         path: 'inOutWarehouseTaskEdit',
         query: {
-          relevanceId: row.relevanceId,
-        },
+          relevanceId: row.relevanceId
+        }
       })
     },
     dateFormat(fmt, date) {
@@ -386,7 +362,7 @@ export default {
         'Y+': date.getFullYear().toString(), // 年
         'm+': (date.getMonth() + 1).toString(), // 月
         'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString(), // 时
+        'H+': date.getHours().toString() // 时
         // "M+": date.getMinutes().toString(),         // 分
         // "S+": date.getSeconds().toString()          // 秒
         // 有其他格式化字符需求可以继续添加，必须转化成字符串
@@ -426,19 +402,19 @@ export default {
       this.$confirm(`是否将状态改为${status}`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
           editstatus({ id: row.id })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$notify.success({
                 title: '成功',
-                message: '状态修改成功',
+                message: '状态修改成功'
               })
               this.getList()
             })
-            .catch((response) => {
+            .catch(response => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
             })
         })
@@ -456,7 +432,7 @@ export default {
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id },
+        query: { id: row.id }
       })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
@@ -466,7 +442,7 @@ export default {
     history(row) {
       billoperatehis({ id: row.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.historyList = response
         })
     },
@@ -484,20 +460,19 @@ export default {
           searchType: this.searchType,
           searchKeyWord: this.searchKeyWord,
           startDate: this.startDate,
-          endDate: this.endDate,
+          endDate: this.endDate
         },
         {},
         { responseType: 'blob' }
       ).toPromise()
       downloadFile({
         res: data,
-        fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
-        type: 'xls',
+        fileName: `${this.date.year +
+          (this.date.month ? `-${this.date.month}` : '')}_采购合同`,
+        type: 'xls'
       })
-    },
-  },
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -582,28 +557,29 @@ export default {
 .search {
   margin-left: -250px;
 }
-.butt{
- margin-left: 60px;
- margin-top: 20px;
+.butt {
+  margin-left: 6px;
+  margin-top: 20px;
 }
-.Value{
+.Value {
   width: 300px;
-  margin-left: 69%;
+  margin-left: 766px;
 }
 .el-pagination {
   margin-bottom: 20px;
   margin-left: 40%;
 }
-.winseaview-main{
- background: #E8ECF6;
-box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+.winseaview-main {
+  background: #e8ecf6;
+  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 }
-.nav{
-  background: white
-  
+.nav {
+  background: white;
+  height: 60px;
+  margin-top: -20px
 }
-.navv{
-  background: #FFFFFF;
+.navv {
+  background: #ffffff;
   border-radius: 4px;
   margin-top: -8px;
 }
@@ -612,9 +588,9 @@ box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 //   height: 5px;
 //   background-color: #e8eaf1;
 // }
-.nav2{
+.nav2 {
   height: 25px;
-  background: #E8ECF6;
+  background: #e8ecf6;
   margin-top: 15px;
 }
 .spans {

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -62,13 +62,14 @@
             :key="index"
           >
             <div class="zhong">
-                <ws-form-item label="姓名" span="1" prop="driver" class="siji">
+                <ws-form-item label="姓名" span="1" prop="driver" class="ys">
                   <el-select
                     v-model="item.driver"
                     placeholder="请选择姓名"
                     filterable
                     :filter-method="dataFilter"
                     @change="selectstaff"
+                    class="ys"
                   >
                     <el-option
                       v-for="item in options"
@@ -78,7 +79,7 @@
                     />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
+                <ws-form-item label="电话" span="1" prop="driverPhone" class="zz">
                   <ws-input
                     :readonly="true"
                     v-model="item.driverPhone"
@@ -87,7 +88,7 @@
                     size="small"
                   />
                 </ws-form-item>
-                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
+                <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="">
                   <ws-date-picker
                     v-model="item.sendDateStart"
                     type="date"
@@ -95,7 +96,7 @@
                     value-format="yyyy-MM-dd"
                   />
                 </ws-form-item>
-                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
+                <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="">
                   <ws-date-picker
                     v-model="item.receiveDateEnd"
                     type="date"
@@ -103,7 +104,7 @@
                     value-format="yyyy-MM-dd"
                   />
                 </ws-form-item>
-                <ws-form-item label="船名" span="1" prop="shipName" class="siji">
+                <ws-form-item label="船名" span="1" prop="shipName" class="">
                   <ws-input
                     v-model="item.shipName"
                     placeholder="请输入船名"
@@ -111,10 +112,10 @@
                     size="small"
                   ></ws-input>
                 </ws-form-item>
-                <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
+                <ws-form-item label="航次" span="1" prop="shipNo" class="">
                   <ws-input v-model="item.shipNo" placeholder="请选择航次" maxlength="100" size="small"></ws-input>
                 </ws-form-item>
-                <ws-form-item label="类型" span="1" prop="shipType" class="siji">
+                <ws-form-item label="类型" span="1" prop="shipType" class="">
                   <ws-select v-model="item.shipType" placeholder="请输入" class="typeselect">
                     <ws-option
                       v-for="items in shipType"
@@ -687,6 +688,7 @@ export default {
   border-radius: 4px;
   /* border: 1px solid #d8dce6; */
   width: 1010px;
+  
 }
 /deep/.zi {
   width: 64px;
@@ -784,4 +786,9 @@ export default {
 .bg-left {
   padding-left: 30px;
 }
+.ys{
+  // margin-left: 300px;
+  width: 230px;
+  background: #5878e8;
+}
 </style>