Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/api/V2/warehouse/index.js

@@ -72,8 +72,12 @@ export const API_POST_EDIT_INVENTORYCOSTINFO = '/inventoryCostInfo/api/editInven
 export const API_GET_WEIGHTEDDETAILS = '/weightedDetails/selectInventoryCostInfo'
 // 库
 export const API_GET_WAREHOUSE = '/warehouseBaseInfo/selectWarehouse'
-// 出入库任务
+// 出入库任务负责人
 export const API_GET_WAREHOUSERESPONSIBLE = "/warehouseBaseInfo/selectResponsible"
+// 出入库任务
+export const API_GET_WAREHOUSETASK = "/inOutWarehouseTask/selectWarehouseTask"
+// 修改经办人
+export const API_GET_CHECKORUPDATE = "/inOutWarehouseTask/api/checkOrUpdateInOutTask"
 
 
 

src/model/warehouse/index.js

@@ -35,7 +35,9 @@ import {
     API_POST_EDIT_INVENTORYCOSTINFO,
     API_GET_WEIGHTEDDETAILS,
     API_GET_WAREHOUSE,
-    API_GET_WAREHOUSERESPONSIBLE
+    API_GET_WAREHOUSERESPONSIBLE,
+    API_GET_WAREHOUSETASK,
+    API_GET_CHECKORUPDATE
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
 // 列表
@@ -107,5 +109,9 @@ export const editinventory = appRx.post(API_POST_EDIT_INVENTORYCOSTINFO,errorCat
 export const weighteddetails = appRx.get(API_GET_WEIGHTEDDETAILS,errorCatcher, errorHandle, filter)
 // 编辑库点费用
 export const getwarehousebase = appRx.get(API_GET_WAREHOUSE,errorCatcher, errorHandle, filter)
-//负者人
-export const getsponsible = appRx.get(API_GET_WAREHOUSERESPONSIBLE,errorCatcher, errorHandle, filter)
+//负责人
+export const getsponsible = appRx.get(API_GET_WAREHOUSERESPONSIBLE,errorCatcher, errorHandle, filter)
+//出入库任务
+export const getwarehousetask = appRx.get(API_GET_WAREHOUSETASK,errorCatcher, errorHandle, filter)
+//修改经办人
+export const postcheckorupdate = appRx.post(API_GET_CHECKORUPDATE,errorCatcher, errorHandle, filter)

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -695,6 +695,8 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
+    this.selectedOptions=[]
+    this.selectedOptions1 = []
     this.deptBudgetList.packingMethod = '散装'
     this.deptBudgetList.packingMethodKey = 1
     this.deptBudgetList.contractGoodsInfo.goodsName = '玉米'

src/views/contractManagement/purchaseContractAdd.vue

@@ -639,6 +639,8 @@ export default {
     }
   },
   activated() {
+    this.selectedOptions=[]
+    this.selectedOptions1 = []
     this.deptBudgetList.packingMethod = '散装'
     this.deptBudgetList.packingMethodKey = 1
     this.deptBudgetList.contractGoodsInfo.goodsName = '玉米'

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -3,76 +3,36 @@
   <div class="container">
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button
-          type="primary"
-          @click="handleAdd()"
-          v-hasPermission="
+        <ws-button 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
-          />添加
+            " src="../../../public/img/header-add.png" alt />添加
         </ws-button>
       </template>
       <template slot="right">
-        <span style="width: 70px; display: inline-block; color: #8890b1"
-          >状态：</span
-        >
-        <ws-select
-          v-model="searchTypeText"
-          placeholder
-          class="typeselect"
-          @change="selecttaskType"
-          :value="searchType"
-        >
-          <ws-option
-            v-for="item in taskTypeList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1"
-          />
+        <span style="width: 70px; display: inline-block; color: #8890b1">状态：</span>
+        <ws-select v-model="searchTypeText" placeholder class="typeselect" @change="selecttaskType" :value="searchType">
+          <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
+            style="color: #8890b1" />
         </ws-select>
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按合同编号或任务编号查找"
-          clearable
-          maxlength="500"
-          type="input"
-        ></ws-input>
+        <ws-input v-model="searchKeyWord" placeholder="可按合同编号或任务编号查找" clearable maxlength="500" type="input"></ws-input>
         <ws-button class="find" type="primary" @click="lookUp()">
-          <img
-            width="16"
-            height="16"
-            style="
+          <img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -7px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt
-          />
+            " src="../../../public/img/sousuo.png" alt />
         </ws-button>
       </template>
     </BaseHeaderLayout>
     <div class="navv">
-      <el-table
-        class="wenzi"
-        :data="gainList.records"
-        style="width: 100%"
-        height="780"
-      >
+      <el-table class="wenzi" :data="gainList.records" style="width: 100%" height="780">
         <el-table-column type="index" label="序号">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -100,540 +60,511 @@
             </div>
           </template> -->
         </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="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">
-             <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>
-              </template>
-            <img
-              v-if="scope.row.taskStatus == '执行中'"
-              width="17"
-              height="18"
-              style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png"
-              @click="editClick(scope.row)"
-              alt
-            />
+            <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>
+            </template>
+            <img v-if="scope.row.taskStatus == '执行中'" width="17" height="18"
+              style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
+              @click="editClick(scope.row)" 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">
-            <span
-              class="corles"
-              @click="nocomplete(scope.row)"
-              v-hasPermission="
+            <span class="corles" @click="nocomplete(scope.row)" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.View`
-              "
-              >查看</span
-            >
-            <el-divider
-              direction="vertical"
-              v-if="scope.row.taskStatus == '待审核'"
-            ></el-divider>
-            <span
-              class="corles"
-              v-hasPermission="
+
+              ">查看</span>
+            <!-- <el-divider direction="vertical" v-if="scope.row.taskStatus == '待审核'"></el-divider> -->
+            <span class="corles" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.audit`
-              "
-              v-if="scope.row.taskStatus == '待审核'"
-              @click="audit(scope.row)"
-              >审核</span
-            >
-            <el-divider
-              direction="vertical"
-              class="divider"
-              v-if="
+              " v-if="scope.row.taskStatus == '待审核'" @click="audit(scope.row)">审核</span>
+            <el-divider direction="vertical" class="divider" v-if="
                 scope.row.taskStatus == '待审核' ||
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
-              "
-            ></el-divider>
-            <span
-              class="corles"
-              v-hasPermission="
+              "></el-divider>
+            <span class="corles" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.edit`
-              "
-              v-if="
+              " v-if="
                 scope.row.taskStatus == '待审核' ||
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
-              "
-              @click="delivery(scope.row)"
-              >编辑</span
-            >
-            <el-divider
-            v-hasPermission="
+              " @click="delivery(scope.row)">编辑</span>
+            <el-divider v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.edit`
-              "
-              direction="vertical"
-              v-if="scope.row.taskId == null"
-            ></el-divider>
-            <span
-              class="corles"
-              v-hasPermission="
+              " direction="vertical" v-if="scope.row.taskId == null"></el-divider>
+            <span class="corles" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
-              "
-              v-if="scope.row.taskId == null"
-              @click="deleteclick(scope.row)"
-              >删除</span
-            >
+              " v-if="scope.row.taskId == null" @click="deleteclick(scope.row)">删除</span>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-size="pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal"
-      ></el-pagination>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
     </div>
   </div>
 </template>
 <script>
-import { getoreditoutput, outdelete, movestates } from '@/model/tasksport/index'
-import { downloadFile } from '@/utils/batchDown'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    getoreditoutput,
+    outdelete,
+    movestates
+  } from '@/model/tasksport/index'
+  import {
+    downloadFile
+  } from '@/utils/batchDown'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    dayjs,
+    fmoney,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-    isShow(val) {
-      this.showType = val
+    watch: {
+      vesselId(val) {
+        this.getList()
+      },
+      isShow(val) {
+        this.showType = val
+      },
     },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
 
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      gainList: [],
-      currentPage: 1,
-      primary: '1',
-      pageSize: 10,
-      searchType: 1,
-      searchTypeText: '待审核',
-      searchKeyWord: '',
-      contractType: 2,
-      taskTypeList: [
-        { value: '待审核', type: 1 },
-        { value: '执行中', type: 3 },
-        { value: '已驳回', type: 2 },
-        { value: '已完成', type: 4 },
-        { value: '全部任务', type: '' },
-      ],
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      warehouseName: '',
-      deptBudgetTotal: 0,
-      compId: sessionStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        gainList: [],
+        currentPage: 1,
+        primary: '1',
+        pageSize: 10,
+        searchType: 1,
+        searchTypeText: '待审核',
+        searchKeyWord: '',
+        contractType: 2,
+        taskTypeList: [{
+            value: '待审核',
+            type: 1
+          },
+          {
+            value: '执行中',
+            type: 3
+          },
+          {
+            value: '已驳回',
+            type: 2
+          },
+          {
+            value: '已完成',
+            type: 4
+          },
+          {
+            value: '全部任务',
+            type: ''
+          },
+        ],
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        warehouseName: '',
+        deptBudgetTotal: 0,
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
         },
-      },
-      accessoryTFs: false,
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  mounted() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    //添加
-    handleAdd() {
-      this.$router.push({ path: 'tranManagementWarehouseInOuttaskAdd' })
+        accessoryTFs: false,
+      }
     },
-    //查找
-    lookUp() {
-      this.currentPage = 1
+    activated() {
       this.getList()
+      this.showType = this.isShow
     },
-    deleteclick(row) {
-      var text = ''
-      if (
-        (row.taskTypeKey == 3 && row.inOutType == '移库出库') ||
-        (row.taskTypeKey == 4 && row.inOutType == '销售出库') ||
-        (row.taskTypeKey == 4 && row.inOutType == '退库')
-      ) {
-        text = '相同任务编号的任务将一并删除且不可恢复，是否确定删除？'
-      } else {
-        text = `任务删除后不可恢复，是否确定删除？`
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(text, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          outdelete({
-            id: row.id,
-            relevanceId: row.relevanceId,
-            inOutFlag: row.inOutFlag,
-          })
-            .toPromise()
-            .then((response) => {
-              this.getList()
-            })
+    mounted() {
+      this.getList()
+      this.showType = this.isShow
+    },
+    methods: {
+      //添加
+      handleAdd() {
+        this.$router.push({
+          path: 'tranManagementWarehouseInOuttaskAdd'
         })
-        .catch(() => {
-          return false
+      },
+      //查找
+      lookUp() {
+        this.currentPage = 1
+        this.getList()
+      },
+      deleteclick(row) {
+        var text = ''
+        if (
+          (row.taskTypeKey == 3 && row.inOutType == '移库出库') ||
+          (row.taskTypeKey == 4 && row.inOutType == '销售出库') ||
+          (row.taskTypeKey == 4 && row.inOutType == '退库')
+        ) {
+          text = '相同任务编号的任务将一并删除且不可恢复，是否确定删除？'
+        } else {
+          text = `任务删除后不可恢复，是否确定删除？`
+        }
+        //cancelButtonClass: "btn-custom-cancel"
+        this.$confirm(text, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            outdelete({
+                id: row.id,
+                relevanceId: row.relevanceId,
+                inOutFlag: row.inOutFlag,
+              })
+              .toPromise()
+              .then((response) => {
+                this.getList()
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      getList() {
+        getoreditoutput({
+            compId: sessionStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchType: this.searchType,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            this.gainList = response
+            this.currentPage = response.current
+            this.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
+      //编辑
+      delivery(item) {
+        this.$router.push({
+          path: 'tranManagementWarehouseInOuttaskedit',
+          query: {
+            relevanceId: item.relevanceId,
+            inOutFlag: item.inOutFlag
+          },
         })
-    },
-    getList() {
-      getoreditoutput({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          this.gainList = response
-          this.currentPage = response.current
-          this.pageSize = response.size
-          this.deptBudgetTotal = response.total
+      },
+      audit(item) {
+        this.$router.push({
+          path: 'tranManagementWarehouseInOuttaskaudit',
+          query: {
+            relevanceId: item.relevanceId,
+            taskId: item.taskId,
+            businessKey: item.id,
+            workflowId: item.workflowId,
+          },
         })
-    },
-    //编辑
-    delivery(item) {
-      this.$router.push({
-        path: 'tranManagementWarehouseInOuttaskedit',
-        query: {
-          relevanceId: item.relevanceId,
-          inOutFlag: item.inOutFlag
-        },
-      })
-    },
-    audit(item) {
-      this.$router.push({
-        path: 'tranManagementWarehouseInOuttaskaudit',
-        query: {
-          relevanceId: item.relevanceId,
-          taskId: item.taskId,
-          businessKey: item.id,
-          workflowId: item.workflowId,
-        },
-      })
-    },
-    getSpanArr(data) {
-      let that = this
+      },
+      getSpanArr(data) {
+        let that = this
 
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
 
-      that.spanArr = []
+        that.spanArr = []
 
-      that.pos = 0
+        that.pos = 0
 
-      //遍历数据
+        //遍历数据
 
-      data.forEach((item, index) => {
-        //判断是否是第一项
+        data.forEach((item, index) => {
+          //判断是否是第一项
 
-        // if (index === 0) {
-        //   this.spanArr.push(1)
-        //   this.pos = 0
-        // } else {
-        //不是第一项时，就根据标识去存储
-        if (data[index].warehouseNumViewList.length > 1) {
-          // 查找到符合条件的数据时每次要把之前存储的数据+1
-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-          this.spanArr.push(0)
-        } else {
-          // 没有符合的数据时，要记住当前的index
-          this.spanArr.push(1)
-          this.pos = index
+          // if (index === 0) {
+          //   this.spanArr.push(1)
+          //   this.pos = 0
+          // } else {
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            // 查找到符合条件的数据时每次要把之前存储的数据+1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
+          // }
+        })
+      },
+      //查看//传参
+      nocomplete(row) {
+        this.$router.push({
+          path: 'inOutWarehousetaskEdit',
+          query: {
+            relevanceId: row.relevanceId,
+            businessKey: row.id,
+            workflowId: row.workflowId,
+          },
+        })
+      },
+      dateFormat(fmt, date) {
+        let ret
+        const opt = {
+          'Y+': date.getFullYear().toString(), // 年
+          'm+': (date.getMonth() + 1).toString(), // 月
+          'd+': date.getDate().toString(), // 日
+          'H+': date.getHours().toString(), // 时
+          // "M+": date.getMinutes().toString(),         // 分
+          // "S+": date.getSeconds().toString()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
         }
-        // }
-      })
-    },
-    //查看//传参
-    nocomplete(row) {
-      this.$router.push({
-        path: 'inOutWarehousetaskEdit',
-        query: {
-          relevanceId: row.relevanceId,
-          businessKey: row.id,
-          workflowId: row.workflowId,
-        },
-      })
-    },
-    dateFormat(fmt, date) {
-      let ret
-      const opt = {
-        'Y+': date.getFullYear().toString(), // 年
-        'm+': (date.getMonth() + 1).toString(), // 月
-        'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString(), // 时
-        // "M+": date.getMinutes().toString(),         // 分
-        // "S+": date.getSeconds().toString()          // 秒
-        // 有其他格式化字符需求可以继续添加，必须转化成字符串
-      }
-      for (let k in opt) {
-        ret = new RegExp('(' + k + ')').exec(fmt)
-        if (ret) {
-          fmt = fmt.replace(
-            ret[1],
-            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-          )
+        for (let k in opt) {
+          ret = new RegExp('(' + k + ')').exec(fmt)
+          if (ret) {
+            fmt = fmt.replace(
+              ret[1],
+              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+            )
+          }
         }
-      }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    editClick(row) {
-      var status = ''
-      if (row.taskStatus == '待审核' || row.taskStatus == '已完成') {
-        status = '执行中'
-      } else if (row.taskStatus == '执行中') {
-        status = '已完成'
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          movestates({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功',
+        return fmt
+      },
+      handleClose() {
+        this.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      editClick(row) {
+        var status = ''
+        if (row.taskStatus == '待审核' || row.taskStatus == '已完成') {
+          status = '执行中'
+        } else if (row.taskStatus == '执行中') {
+          status = '已完成'
+        }
+        //cancelButtonClass: "btn-custom-cancel"
+        this.$confirm(`是否将状态改为${status}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            movestates({
+                id: row.id
               })
-              this.getList()
-            })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '状态修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      selecttaskType(e) {
+        for (var i = 0; i < this.taskTypeList.length; i++) {
+          if (this.taskTypeList[i].value == e) {
+            this.searchType = this.taskTypeList[i].type
+          }
         }
-      }
-      this.currentPage=1,
-      this.getList()
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
+        this.currentPage = 1,
+          this.getList()
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          query: {
+            id: row.id
+          },
         })
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
+      history(row) {
+        billoperatehis({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
+      find() {
+        this.currentPage = 1
+        this.getList()
+      },
     },
-    find() {
-      this.currentPage = 1
-      this.getList()
-    },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-.completed.el-button--default {
-  border-color: #5878e8;
-  background-color: #f6f7fc;
-  color: #5878e8;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  .completed.el-button--default {
+    border-color: #5878e8;
+    background-color: #f6f7fc;
+    color: #5878e8;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .el-row {
+    height: 50px;
+  }
+
+  .findValue {
+    width: 0%;
+    margin-left: 25%;
+  }
+
+  .search {
+    margin-left: -250px;
+  }
+
+  .Value {
+    width: 300px;
+    margin-left: 766px;
+  }
+
+  .el-pagination {
+    text-align: center;
+  }
+
+  .winseaview-main {
+    background: #e8ecf6;
+    box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+  }
+
+  .spans {
+    display: table-caption;
+    width: 17px;
+    line-height: 19px;
+  }
+
+  //执行样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
+
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
 
-.el-row {
-  height: 50px;
-}
-.findValue {
-  width: 0%;
-  margin-left: 25%;
-}
-.search {
-  margin-left: -250px;
-}
-.Value {
-  width: 300px;
-  margin-left: 766px;
-}
-.el-pagination {
-  text-align: center;
-}
-.winseaview-main {
-  background: #e8ecf6;
-  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
-}
-.spans {
-  display: table-caption;
-  width: 17px;
-  line-height: 19px;
-}
-//执行样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-.el-select {
-  width: 30%;
-  margin-right: 10px;
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
-.corles {
-  color: #5878e8;
-  font-size: 14px;
-}
+  .corles {
+    color: #5878e8;
+    font-size: 14px;
+  }
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -7,13 +7,8 @@
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
-          <img
-            width="6"
-            height="10"
-            style="vertical-align: bottom; margin-right: 3px"
-            src="../../../public/img/lujing.png"
-            alt
-          />返回
+          <img width="6" height="10" style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png" alt />返回
         </el-button>
       </el-col>
     </el-row>
@@ -28,13 +23,8 @@
       </div>
       <div class="ding"></div>
       <div v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4" class="center1">
-        <img
-          style="position: relative; top: 40px; left: 300px"
-          width="19"
-          height="19"
-          src="../../../public/img/cangku.png"
-          alt
-        />
+        <img style="position: relative; top: 40px; left: 300px" width="19" height="19"
+          src="../../../public/img/cangku.png" alt />
         <!--出库=-->
         <div class="small-title">
           <h3>出库任务({{ inOutTaskNo }})</h3>
@@ -42,586 +32,281 @@
         <el-form ref="dataList" :model="dataList" label-width="140px" input-width="300px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
-            <el-select
-              v-model="dataList.warehouseName"
-              placeholder="请选择仓库名"
-              class="typeselect"
-              @change="selectwarehouseName"
-            >
-              <el-option
-                v-for="item in warehouseNameList"
-                :key="item.constKey"
-                :label="item.warehouseName"
-                :value="item.id"
-              />
+            <el-select v-model="dataList.warehouseName" placeholder="请选择仓库名" class="typeselect"
+              @change="selectwarehouseName">
+              <el-option v-for="item in warehouseNameList" :key="item.constKey" :label="item.warehouseName"
+                :value="item.id" />
             </el-select>
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="出库类型">
-            <el-select
-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
-              v-model="dataList.inOutType"
-              placeholder="请选择出库类型"
-              class="typeselect"
-              @change="selectstorageType"
-            >
-              <el-option
-                v-for="item in storageType"
-                :key="item.constKey"
-                v-if="
+            <el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.inOutType"
+              placeholder="请选择出库类型" class="typeselect" @change="selectstorageType">
+              <el-option v-for="item in storageType" :key="item.constKey" v-if="
                   (dataList.taskTypeKey == 1 &&
                     item.constValue != '移库出库') ||
                   (dataList.taskTypeKey == 3 &&
                     item.constValue == '移库出库') ||
                   (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
-                "
-                :label="item.constValue"
-                :value="item.constValue"
-              />
+                " :label="item.constValue" :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!-- 合同编号 -->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
-            <el-select
-              @change="changecontract"
-              v-model="dataList.contractNo"
-              placeholder="请输入合同编号"
-              class="typeselect"
-            >
-              <el-option
-                v-for="item in contractNoList"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
+            <el-select @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号" class="typeselect">
+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+                :value="item.contractNo"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
-            <el-input
-              @input="selectTaskNo"
-              v-model="dataList.moveTaskNo"
-              placeholder="请输入移库任务编号"
-              class="typeselect"
-            >
-              <el-option
-                v-for="item in contractNoList"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
+            <el-input @input="selectTaskNo" v-model="dataList.moveTaskNo" placeholder="请输入移库任务编号" class="typeselect">
+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+                :value="item.contractNo"></el-option>
             </el-input>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
-            <el-select
-              :disabled="dataList.taskTypeKey != 3"
-              v-model="dataList.goodsName"
-              placeholder="货名"
-              class="huom"
-              @change="selectgoodsName"
-            >
-              <el-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              ></el-option>
+            <el-select :disabled="dataList.taskTypeKey != 3" v-model="dataList.goodsName" placeholder="货名" class="huom"
+              @change="selectgoodsName">
+              <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
+                :value="item.constValue"></el-option>
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input
-              @input="weightchange1"
-              v-model="dataList.weight"
-              placeholder="请输入重量"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="weightchange1" v-model="dataList.weight" placeholder="请输入重量" maxlength="120" size="small"
+              class="huom" />
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select
-              v-model="dataList.grade"
-              placeholder
-              class="typeselect"
-              @change="selectpackingMethod"
-            >
-              <el-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
+            <el-select v-model="dataList.grade" placeholder class="typeselect" @change="selectpackingMethod">
+              <el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
+                :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
           <el-form-item label="容重(克/升)>=">
-            <el-input
-              @input="bulkDensitychange"
-              v-model="dataList.bulkDensity"
-              placeholder="请输入容重"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="bulkDensitychange" v-model="dataList.bulkDensity" placeholder="请输入容重" maxlength="120"
+              size="small" class="huom" />
           </el-form-item>
           <!--水分（%）<=-->
           <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input
-              @input="waterContentchange"
-              v-model="dataList.waterContent"
-              placeholder="请输入水分占比"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="waterContentchange" v-model="dataList.waterContent" placeholder="请输入水分占比" maxlength="120"
+              size="small" class="huom" />
           </el-form-item>
           <!--单价(元/吨)-->
           <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
-            <el-input
-              @input="unitPricechange"
-              v-model="dataList.unitPrice"
-              placeholder="请输入单价"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="unitPricechange" v-model="dataList.unitPrice" placeholder="请输入单价" maxlength="120"
+              size="small" class="huom" />
           </el-form-item>
           <!--预计出库日期-->
           <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
-            <el-date-picker
-              v-model="dataList.predictDate"
-              type="date"
-              placeholder="请选择预计出库日期"
-              value-format="yyyy-MM-dd"
-            />
+            <el-date-picker v-model="dataList.predictDate" type="date" placeholder="请选择预计出库日期"
+              value-format="yyyy-MM-dd" />
           </el-form-item>
           <!--经办人-->
           <el-form-item label="出库经办人">
-            <el-select
-              v-model="dataList.agent"
-              placeholder="请选择经办人"
-              filterable
-              :filter-method="dataFilter"
-              @change="selectstaff"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
+            <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable :filter-method="dataFilter"
+              @change="selectstaff">
+              <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
           </el-form-item>
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="20">
-            <el-input
-              v-model="dataList.businessDescribe"
-              placeholder="请输入业务描述，不超过150字"
-              maxlength="150"
-              size="large"
-            />
+            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述，不超过150字" maxlength="150" size="large" />
           </el-form-item>
         </el-form>
       </div>
       <div v-show="dataList.taskTypeKey != 1" class="center1">
-        <img
-          style="position: relative; top: 40px; left: 300px"
-          width="19"
-          height="19"
-          src="../../../public/img/cangku.png"
-          alt
-        />
+        <img style="position: relative; top: 40px; left: 300px" width="19" height="19"
+          src="../../../public/img/cangku.png" alt />
         <div class="small-title">
           <h3>入库任务({{ inOutTaskNo1 }} )</h3>
         </div>
         <el-form v-if="!deletetask" ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
-            <el-select
-              v-model="dataList1.warehouseName"
-              placeholder="请选择仓库名"
-              class="typeselect"
-              @change="selectwarehouseName1"
-            >
-              <el-option
-                v-for="item in warehouseNameList"
-                :key="item.constKey"
-                :label="item.warehouseName"
-                :value="item.id"
-              />
+            <el-select v-model="dataList1.warehouseName" placeholder="请选择仓库名" class="typeselect"
+              @change="selectwarehouseName1">
+              <el-option v-for="item in warehouseNameList" :key="item.constKey" :label="item.warehouseName"
+                :value="item.id" />
             </el-select>
           </el-form-item>
           <!-- 入库类型 -->
+          {{storageType1}}
           <el-form-item label="入库类型">
-            <el-select
-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
-              v-model="dataList1.inOutType"
-              placeholder="请选择入库类型"
-              class="typeselect"
-              @change="selectstorageType1"
-            >
-              <el-option
-                v-for="item in storageType1"
-                :key="item.constKey"
-                v-if="
+            <el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList1.inOutType"
+              placeholder="请选择入库类型" class="typeselect" @change="selectstorageType1">
+              <el-option v-for="item in storageType1" :key="item.constKey" v-if="
                   (dataList1.taskTypeKey == 2 &&
                     item.constValue != '移库入库') ||
                   (dataList1.taskTypeKey == 3 &&
                     item.constValue == '移库入库') ||
                   (dataList1.taskTypeKey == 4 && item.constValue == '退库')
-                "
-                :label="item.constValue"
-                :value="item.constValue"
-              />
+                " :label="item.constValue" :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!-- 合同编号 -->
           <el-form-item v-if="dataList1.taskTypeKey != 3" label="合同编号">
-            <el-select
-              @change="changecontract1"
-              v-model="dataList1.contractNo"
-              placeholder="请输入合同编号"
-              class="typeselect"
-            >
-              <el-option
-                v-for="item in contractNoList1"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
+            <el-select @change="changecontract1" v-model="dataList1.contractNo" placeholder="请输入合同编号"
+              class="typeselect">
+              <el-option v-for="item in contractNoList1" :key="item.constKey" :label="item.contractNo"
+                :value="item.contractNo"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item v-if="dataList1.taskTypeKey == 3" label="移库任务编号">
-            <el-input
-              disabled
-              v-model="dataList1.moveTaskNo"
-              placeholder="请输入移库任务编号"
-              class="typeselect"
-            >
-              <el-option
-                v-for="item in contractNoList"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
+            <el-input disabled v-model="dataList1.moveTaskNo" placeholder="请输入移库任务编号" class="typeselect">
+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+                :value="item.contractNo"></el-option>
             </el-input>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
-            <el-select
-              :disabled="dataList.taskTypeKey != 3 || dataList.taskTypeKey == 3"
-              v-model="dataList.goodsName"
-              placeholder="货名"
-              class="huom"
-              @change="selectgoodsName1"
-            >
-              <el-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              ></el-option>
+            <el-select :disabled="dataList.taskTypeKey != 3 || dataList.taskTypeKey == 3" v-model="dataList.goodsName"
+              placeholder="货名" class="huom" @change="selectgoodsName1">
+              <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
+                :value="item.constValue"></el-option>
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input
-              @input="weightchange"
-              v-model="dataList1.weight"
-              placeholder="请输入重量"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量" maxlength="120" size="small"
+              class="huom" />
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select
-              :disabled="dataList.taskTypeKey == 3"
-              v-model="dataList1.grade"
-              placeholder
-              class="typeselect"
-              @change="selectpackingMethod1"
-            >
-              <el-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
+            <el-select :disabled="dataList.taskTypeKey == 3" v-model="dataList1.grade" placeholder class="typeselect"
+              @change="selectpackingMethod1">
+              <el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
+                :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
           <el-form-item label="容重(克/升)>=">
-            <el-input
-              @input="bulkDensitychange"
-              :disabled="dataList.taskTypeKey == 3"
-              v-model="dataList1.bulkDensity"
-              placeholder="请输入容重"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="bulkDensitychange" :disabled="dataList.taskTypeKey == 3" v-model="dataList1.bulkDensity"
+              placeholder="请输入容重" maxlength="120" size="small" class="huom" />
           </el-form-item>
           <!--水分（%）<=-->
           <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input
-              @input="waterContentchange"
-              :disabled="dataList.taskTypeKey == 3"
-              v-model="dataList1.waterContent"
-              placeholder="请输入水分占比"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="waterContentchange" :disabled="dataList.taskTypeKey == 3" v-model="dataList1.waterContent"
+              placeholder="请输入水分占比" maxlength="120" size="small" class="huom" />
           </el-form-item>
           <!--单价(元/吨)-->
           <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
-            <el-input
-              @input="unitPricechange"
-              :disabled="dataList.taskTypeKey == 3"
-              v-model="dataList1.unitPrice"
-              placeholder="请输入单价"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input @input="unitPricechange" :disabled="dataList.taskTypeKey == 3" v-model="dataList1.unitPrice"
+              placeholder="请输入单价" maxlength="120" size="small" class="huom" />
           </el-form-item>
           <!--预计出库日期-->
           <el-form-item label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
-            <el-date-picker
-              v-model="dataList1.predictDate"
-              type="date"
-              placeholder="请选择预计入库日期"
-              value-format="yyyy-MM-dd"
-            />
+            <el-date-picker v-model="dataList1.predictDate" type="date" placeholder="请选择预计入库日期"
+              value-format="yyyy-MM-dd" />
           </el-form-item>
           <!--经办人-->
           <el-form-item label="入库经办人">
-            <el-select
-              v-model="dataList1.agent"
-              placeholder="请选择经办人"
-              filterable
-              :filter-method="dataFilter1"
-              @change="selectstaff1"
-            >
-              <el-option
-                v-for="item in options1"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
+            <el-select v-model="dataList1.agent" placeholder="请选择经办人" filterable :filter-method="dataFilter1"
+              @change="selectstaff1">
+              <el-option v-for="item in options1" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
           </el-form-item>
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
-            <el-input
-              v-model="dataList1.businessDescribe"
-              placeholder="请输入业务描述，不超过150字"
-              maxlength="150"
-              size="large"
-            />
+            <el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述，不超过150字" maxlength="150" size="large" />
           </el-form-item>
         </el-form>
       </div>
       <div v-if="dataList.taskTypeKey == 4" class="center1">
         <!--出库=-->
         <div class="small-title">
-          <img
-            style="position: relative; top: 40px; left: -22px"
-            width="19"
-            height="19"
-            src="../../../public/img/cangku.png"
-            alt
-          />
+          <img style="position: relative; top: 40px; left: -22px" width="19" height="19"
+            src="../../../public/img/cangku.png" alt />
           <h3>出库任务({{ inOutTaskNo }})</h3>
         </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
-            <el-select
-              v-model="dataList.warehouseName"
-              placeholder="请选择仓库名"
-              class="typeselect"
-              @change="selectwarehouseName"
-            >
-              <el-option
-                v-for="item in warehouseNameList"
-                :key="item.constKey"
-                :label="item.warehouseName"
-                :value="item.id"
-              />
+            <el-select v-model="dataList.warehouseName" placeholder="请选择仓库名" class="typeselect"
+              @change="selectwarehouseName">
+              <el-option v-for="item in warehouseNameList" :key="item.constKey" :label="item.warehouseName"
+                :value="item.id" />
             </el-select>
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="出库类型">
-            <el-select
-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
-              v-model="dataList.inOutType"
-              placeholder="请选择出库类型"
-              class="typeselect"
-              @change="selectstorageType"
-            >
-              <el-option
-                v-for="item in storageType"
-                :key="item.constKey"
-                v-if="
+            <el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.inOutType"
+              placeholder="请选择出库类型" class="typeselect" @change="selectstorageType">
+              <el-option v-for="item in storageType" :key="item.constKey" v-if="
                   (dataList.taskTypeKey == 1 &&
                     item.constValue != '移库出库') ||
                   (dataList.taskTypeKey == 3 &&
                     item.constValue == '移库出库') ||
                   (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
-                "
-                :label="item.constValue"
-                :value="item.constValue"
-              />
+                " :label="item.constValue" :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!-- 合同编号 -->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
-            <el-select
-              @change="changecontract"
-              v-model="dataList.contractNo"
-              placeholder="请输入合同编号"
-              class="typeselect"
-            >
-              <el-option
-                v-for="item in contractNoList"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
+            <el-select @change="changecontract" v-model="dataList.contractNo" placeholder="请输入合同编号" class="typeselect">
+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+                :value="item.contractNo"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
-            <el-select
-              @change="selectTaskNo"
-              v-model="dataList.moveTaskNo"
-              placeholder="请输入移库任务编号"
-              class="typeselect"
-            >
-              <el-option
-                v-for="item in contractNoList"
-                :key="item.constKey"
-                :label="item.contractNo"
-                :value="item.contractNo"
-              ></el-option>
+            <el-select @change="selectTaskNo" v-model="dataList.moveTaskNo" placeholder="请输入移库任务编号" class="typeselect">
+              <el-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+                :value="item.contractNo"></el-option>
             </el-select>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
-            <el-select
-              :disabled="dataList.taskTypeKey != 3"
-              v-model="dataList.goodsName"
-              placeholder="货名"
-              class="huom"
-              @change="selectgoodsName"
-            >
-              <el-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              ></el-option>
+            <el-select :disabled="dataList.taskTypeKey != 3" v-model="dataList.goodsName" placeholder="货名" class="huom"
+              @change="selectgoodsName">
+              <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue"
+                :value="item.constValue"></el-option>
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input
-              :disabled="dataList.taskTypeKey == 4"
-              v-model="dataList.weight"
-              placeholder="请输入重量"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input :disabled="dataList.taskTypeKey == 4" v-model="dataList.weight" placeholder="请输入重量"
+              maxlength="120" size="small" class="huom" />
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select
-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
-              v-model="dataList.grade"
-              placeholder
-              class="typeselect"
-              @change="selectpackingMethod"
-            >
-              <el-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
+            <el-select :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.grade"
+              placeholder class="typeselect" @change="selectpackingMethod">
+              <el-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
+                :value="item.constValue" />
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
           <el-form-item label="容重(克/升)>=">
-            <el-input
-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
-              v-model="dataList.bulkDensity"
-              placeholder="请输入容重"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.bulkDensity"
+              placeholder="请输入容重" maxlength="120" size="small" class="huom" />
           </el-form-item>
           <!--水分（%）<=-->
           <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
-            <el-input
-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
-              v-model="dataList.waterContent"
-              placeholder="请输入水分占比"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.waterContent"
+              placeholder="请输入水分占比" maxlength="120" size="small" class="huom" />
           </el-form-item>
           <!--单价(元/吨)-->
           <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
-            <el-input
-              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
-              v-model="dataList.unitPrice"
-              placeholder="请输入单价"
-              maxlength="120"
-              size="small"
-              class="huom"
-            />
+            <el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4" v-model="dataList.unitPrice"
+              placeholder="请输入单价" maxlength="120" size="small" class="huom" />
           </el-form-item>
           <!--预计出库日期-->
           <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
-            <el-date-picker
-              v-model="dataList.predictDate"
-              type="date"
-              placeholder="请选择预计出库日期"
-              value-format="yyyy-MM-dd"
-            />
+            <el-date-picker v-model="dataList.predictDate" type="date" placeholder="请选择预计出库日期"
+              value-format="yyyy-MM-dd" />
           </el-form-item>
           <!--经办人-->
           <el-form-item label="出库经办人">
-            <el-select
-              v-model="dataList.agent"
-              placeholder="请选择经办人"
-              filterable
-              :filter-method="dataFilter"
-              @change="selectstaff"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.staffName"
-                :value="item.staffName"
-              />
+            <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable :filter-method="dataFilter"
+              @change="selectstaff">
+              <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
           </el-form-item>
           <!--业务描述=-->
           <el-form-item label="业务描述">
-            <el-input
-              v-model="dataList.businessDescribe"
-              placeholder="请输入业务描述，不超过150字"
-              maxlength="150"
-              size="large"
-            />
+            <el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述，不超过150字" maxlength="150" size="large" />
           </el-form-item>
         </el-form>
       </div>
@@ -633,1470 +318,1529 @@
   </div>
 </template>
 <script>
-import {
-  getwarehousename,
-  xialaNo,
-  addoreditoutput,
-  getGoodsName
-} from '@/model/tasksport/index'
+  import {
+    getwarehousename,
+    xialaNo,
+    addoreditoutput,
+    getGoodsName
+  } from '@/model/tasksport/index'
 
-import { mapGetters } from 'vuex'
-import { pullDown, getstaff } from '@/model/warehouse/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-// import { dayjs, fmoney, EventBus } from 'base-core-lib'
-import { dayjs, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination
-  },
-  watch: {
-    // vesselId(val) {
-    //   this.getList()
-    // },
-    isShow(val) {
-      this.showType = val
+  import {
+    mapGetters
+  } from 'vuex'
+  import {
+    pullDown,
+    getstaff
+  } from '@/model/warehouse/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  // import { dayjs, fmoney, EventBus } from 'base-core-lib'
+  import {
+    dayjs,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination
     },
-    flag(val) {
-      xialaNo({
-        compId: this.compId,
-        flag: val
-      })
-        .toPromise()
-        .then(response => {
-          if (
-            this.dataList1.taskTypeKey == 2 ||
-            this.dataList1.taskTypeKey == 4
-          ) {
-            this.contractNoList1 = response
-            if (this.dataList1.taskTypeKey == 2) {
+    watch: {
+      // vesselId(val) {
+      //   this.getList()
+      // },
+      isShow(val) {
+        this.showType = val
+      },
+      flag(val) {
+        xialaNo({
+            compId: this.compId,
+            flag: val
+          })
+          .toPromise()
+          .then(response => {
+            if (
+              this.dataList1.taskTypeKey == 2 ||
+              this.dataList1.taskTypeKey == 4
+            ) {
+              this.contractNoList1 = response
+              if (this.dataList1.taskTypeKey == 2) {
+                this.contractNoList = response
+              }
+            } else {
               this.contractNoList = response
             }
-          } else {
-            this.contractNoList = response
-          }
-        })
-    }
-  },
-  computed: {
-    ...mapGetters(['deptBudgetList'])
-  },
-  data() {
-    return {
-      flag: 1,
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      // 是否显示
-      showType: true,
-      disabled: false,
-      // 年
-      year: '',
-      contractNoList: [],
-      contractNoList1: [],
-      deptBudgetTotal: 0,
-      readonly: true,
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 1,
-      searchKeyWord: '',
-      radio: '1',
-      contractType: 2,
-      startDate: null,
-      endDate: null,
-      goodnameList: [],
-      checked: true,
-      form: {},
-      staffList: [],
-      staffList1: [],
-      options: [],
-      options1: [],
-      storageType: [],
-      storageType1: [],
-      outContractNo: [],
-      // 提交类型
-      submitType: true,
-      status: [],
-      warehouseNameList: [],
-      warehouseNameList1: [],
-      appendixIdsAdd: '',
-      uploadSuccess: {},
-      deletetask: false,
-      warehouseInOutDetail: {},
-      onChange: {},
-      deptBudgetList1: [],
-      gradeList: [],
-      rules: {
-        netWeight: [
-          {
+          })
+      }
+    },
+    computed: {
+      ...mapGetters(['deptBudgetList'])
+    },
+    data() {
+      return {
+        flag: 1,
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+        // 是否显示
+        showType: true,
+        disabled: false,
+        // 年
+        year: '',
+        contractNoList: [],
+        contractNoList1: [],
+        deptBudgetTotal: 0,
+        readonly: true,
+        currentPage: 1,
+        pageSize: 10,
+        searchType: 1,
+        searchKeyWord: '',
+        radio: '1',
+        contractType: 2,
+        startDate: null,
+        endDate: null,
+        goodnameList: [],
+        checked: true,
+        form: {},
+        staffList: [],
+        staffList1: [],
+        options: [],
+        options1: [],
+        storageType: [],
+        storageType1: [],
+        outContractNo: [],
+        // 提交类型
+        submitType: true,
+        status: [],
+        warehouseNameList: [],
+        warehouseNameList1: [],
+        appendixIdsAdd: '',
+        uploadSuccess: {},
+        deletetask: false,
+        warehouseInOutDetail: {},
+        onChange: {},
+        deptBudgetList1: [],
+        gradeList: [],
+        rules: {
+          netWeight: [{
             required: true,
             type: 'number',
             message: '请输入活动名称',
             trigger: 'blur'
+          }]
+        },
+        size: 10,
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        packtypeList: {},
+        date: {
+          year: dayjs().format('YYYY'),
+          month: dayjs().format('MM')
+        },
+        contractList: [],
+        inOutTaskNo: '',
+        inOutTaskNo1: '',
+        dataList: {
+          taskTypeKey: '1'
+        },
+        dataList1: {
+          taskTypeKey: '1'
+        },
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: time => {
+            return time.getTime() > Date.now()
           }
-        ]
-      },
-      size: 10,
-      compId: sessionStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      packtypeList: {},
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM')
-      },
-      contractList: [],
-      inOutTaskNo: '',
-      inOutTaskNo1: '',
-      dataList: { taskTypeKey: '1' },
-      dataList1: { taskTypeKey: '1' },
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: time => {
-          return time.getTime() > Date.now()
-        }
-      },
-      accessoryTFs: false
-    }
-  },
-  activated() {
-    this.getList()
-  },
-  methods: {
-    //返回按钮
-    revert() {
-      this.$router.go(-1)
-    },
-    returnsales() {
-      this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
-    },
-    // 获取当前年月日
-    getdate() {
-      var date = new Date()
-      var year = date.getFullYear() //获取完整的年份(4位)
-      var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
-      var datetime = date.getDate() //获取当前日(1-31)
-      var hour = date.getHours()
-      var minutes = date.getMinutes()
-      var seconds = date.getSeconds()
-      if (mouth < 10) {
-        mouth = '0' + mouth
-      }
-      if (datetime < 10) {
-        datetime = '0' + datetime
-      }
-      if (hour < 10) {
-        hour = '0' + hour
-      }
-      if (minutes < 10) {
-        minutes = '0' + minutes
+        },
+        accessoryTFs: false
       }
-      if (seconds < 10) {
-        seconds = '0' + seconds
-      }
-      return year + '' + mouth + datetime + hour + minutes + seconds
-    },
-    // 随机验证码
-    verifyinit() {
-      var arr = []
-      for (var i = 48; i < 57; i++) {
-        arr.push(String.fromCharCode(i))
-      }
-      arr.sort(function() {
-        return Math.random() - 0.5
-      })
-      arr.length = 4
-
-      return arr.join('')
     },
-    MathRand() {
-      var Num = ''
-      for (var i = 0; i < 4; i++) {
-        Num += Math.floor(Math.random() * 10)
-      }
-      return Num
-    },
-    selectTaskNo(e) {
-      if (this.dataList.taskTypeKey == 3) {
-        this.$set(this.dataList1, 'moveTaskNo', e)
-      }
+    activated() {
+      this.getList()
     },
-    dataFilter(val) {
-      // console.log(val,"名")
-      this.deptBudgetList.staffList = val
-      if (val) {
-        //val存在
-        this.options = this.staffList.filter(item => {
-          if (
-            !!~item.staffName.indexOf(val) ||
-            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
-          }
+    methods: {
+      //返回按钮
+      revert() {
+        this.$router.go(-1)
+      },
+      returnsales() {
+        this.$router.push({
+          path: 'tranManagementWarehouseInOuttask'
         })
-      } else {
-        //val为空时，还原数组
-        this.options = this.staffList
-      }
-    },
-    dataFilter1(val) {
-      // console.log(val,"名")
-      this.deptBudgetList.staffList1 = val
-      if (val) {
-        //val存在
-        this.options = this.staffList1.filter(item => {
-          if (
-            !!~item.staffName.indexOf(val) ||
-            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
-          }
+      },
+      // 获取当前年月日
+      getdate() {
+        var date = new Date()
+        var year = date.getFullYear() //获取完整的年份(4位)
+        var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+        var datetime = date.getDate() //获取当前日(1-31)
+        var hour = date.getHours()
+        var minutes = date.getMinutes()
+        var seconds = date.getSeconds()
+        if (mouth < 10) {
+          mouth = '0' + mouth
+        }
+        if (datetime < 10) {
+          datetime = '0' + datetime
+        }
+        if (hour < 10) {
+          hour = '0' + hour
+        }
+        if (minutes < 10) {
+          minutes = '0' + minutes
+        }
+        if (seconds < 10) {
+          seconds = '0' + seconds
+        }
+        return year + '' + mouth + datetime + hour + minutes + seconds
+      },
+      // 随机验证码
+      verifyinit() {
+        var arr = []
+        for (var i = 48; i < 57; i++) {
+          arr.push(String.fromCharCode(i))
+        }
+        arr.sort(function() {
+          return Math.random() - 0.5
         })
-      } else {
-        //val为空时，还原数组
-        this.options1 = this.staffList1
-      }
-    },
-    weightchange(e) {
-      if (this.dataList.taskTypeKey == 4) {
-        this.$set(this.dataList, 'weight', e)
-      }
-    },
-    weightchange1(e) {
-      if (this.dataList.taskTypeKey == 3) {
-        this.$set(this.dataList1, 'weight', e)
-      }
-    },
-    bulkDensitychange(e) {
-      if (this.dataList.taskTypeKey == 4) {
-        this.$set(this.dataList, 'bulkDensity', e)
-      } else if (this.dataList1.taskTypeKey == 3) {
-        this.$set(this.dataList1, 'bulkDensity', e)
-      }
-    },
-    waterContentchange(e) {
-      if (this.dataList.taskTypeKey == 4) {
-        this.$set(this.dataList, 'waterContent', e)
-      } else if (this.dataList1.taskTypeKey == 3) {
-        this.$set(this.dataList1, 'waterContent', e)
-      }
-    },
-    unitPricechange(e) {
-      if (this.dataList.taskTypeKey == 4) {
-        this.$set(this.dataList, 'unitPrice', e)
-      } else if (this.dataList1.taskTypeKey == 3) {
-        this.$set(this.dataList1, 'unitPrice', e)
-      }
-    },
-    changecontract(e) {
-      if (this.dataList.taskTypeKey != 3) {
-        for (let i = 0; i < this.contractNoList.length; i++) {
-          if (this.contractNoList[i].contractNo == e) {
-            getGoodsName({
-              contractId: this.contractNoList[i].id,
-              contractNo: this.contractNoList[i].contractNo
-            })
-              .toPromise()
-              .then(response => {
-                this.$set(this.dataList, 'goodsName', response.goodsName)
-                this.$set(this.dataList, 'goodsNameKey', response.goodsNameKey)
-                this.$set(this.dataList, 'grade', response.grade)
-                this.$set(this.dataList, 'gradeKey', response.gradeKey)
-                this.$set(this.dataList, 'waterContent', response.waterContent)
-                this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
-                this.$set(this.dataList, 'weight', response.weight)
-                this.$set(
-                  this.dataList,
-                  'unitPrice',
-                  response.unitContractPrice
-                )
-              })
-          }
+        arr.length = 4
+
+        return arr.join('')
+      },
+      MathRand() {
+        var Num = ''
+        for (var i = 0; i < 4; i++) {
+          Num += Math.floor(Math.random() * 10)
         }
-      }
-    },
-    selectwarehouseName(e) {
-      for (var i = 0; i < this.warehouseNameList.length; i++) {
-        if (this.warehouseNameList[i].id == e) {
-          this.dataList.warehouseName = this.warehouseNameList[i].warehouseName
-          //经办人
-          getstaff({
-            compId: sessionStorage.getItem('ws-pf_compId'),
-            warehouseId: e
+        return Num
+      },
+      selectTaskNo(e) {
+        if (this.dataList.taskTypeKey == 3) {
+          this.$set(this.dataList1, 'moveTaskNo', e)
+        }
+      },
+      dataFilter(val) {
+        // console.log(val,"名")
+        this.deptBudgetList.staffList = val
+        if (val) {
+          //val存在
+          this.options = this.staffList.filter(item => {
+            if (
+              !!~item.staffName.indexOf(val) ||
+              !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+            ) {
+              return true
+            }
           })
-            .toPromise()
-            .then(response => {
-              this.options = response
-              this.staffList = response
-              //  this.agent = response
-            })
+        } else {
+          //val为空时，还原数组
+          this.options = this.staffList
         }
-      }
-    },
-    selectwarehouseName1(e) {
-      for (var i = 0; i < this.warehouseNameList.length; i++) {
-        if (this.warehouseNameList[i].id == e) {
-          this.dataList1.warehouseName = this.warehouseNameList[i].warehouseName
-          //经办人
-          getstaff({
-            compId: sessionStorage.getItem('ws-pf_compId'),
-            warehouseId: e
+      },
+      dataFilter1(val) {
+        // console.log(val,"名")
+        this.deptBudgetList.staffList1 = val
+        if (val) {
+          //val存在
+          this.options = this.staffList1.filter(item => {
+            if (
+              !!~item.staffName.indexOf(val) ||
+              !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+            ) {
+              return true
+            }
           })
-            .toPromise()
-            .then(response => {
-              this.options1 = response
-              this.staffList1 = response
-              //  this.agent = response
-            })
+        } else {
+          //val为空时，还原数组
+          this.options1 = this.staffList1
         }
-      }
-    },
-    changecontract1(e) {
-      if (this.dataList1.taskTypeKey != 3) {
-        for (let i = 0; i < this.contractNoList.length; i++) {
-          if (this.contractNoList[i].contractNo == e) {
-            getGoodsName({
-              contractId: this.contractNoList[i].id,
-              contractNo: this.contractNoList[i].contractNo
-            })
+      },
+      weightchange(e) {
+        if (this.dataList.taskTypeKey == 4) {
+          this.$set(this.dataList, 'weight', e)
+        }
+      },
+      weightchange1(e) {
+        if (this.dataList.taskTypeKey == 3) {
+          this.$set(this.dataList1, 'weight', e)
+        }
+      },
+      bulkDensitychange(e) {
+        if (this.dataList.taskTypeKey == 4) {
+          this.$set(this.dataList, 'bulkDensity', e)
+        } else if (this.dataList1.taskTypeKey == 3) {
+          this.$set(this.dataList1, 'bulkDensity', e)
+        }
+      },
+      waterContentchange(e) {
+        if (this.dataList.taskTypeKey == 4) {
+          this.$set(this.dataList, 'waterContent', e)
+        } else if (this.dataList1.taskTypeKey == 3) {
+          this.$set(this.dataList1, 'waterContent', e)
+        }
+      },
+      unitPricechange(e) {
+        if (this.dataList.taskTypeKey == 4) {
+          this.$set(this.dataList, 'unitPrice', e)
+        } else if (this.dataList1.taskTypeKey == 3) {
+          this.$set(this.dataList1, 'unitPrice', e)
+        }
+      },
+      changecontract(e) {
+        if (this.dataList.taskTypeKey != 3) {
+          for (let i = 0; i < this.contractNoList.length; i++) {
+            if (this.contractNoList[i].contractNo == e) {
+              getGoodsName({
+                  contractId: this.contractNoList[i].id,
+                  contractNo: this.contractNoList[i].contractNo
+                })
+                .toPromise()
+                .then(response => {
+                  this.$set(this.dataList, 'goodsName', response.goodsName)
+                  this.$set(this.dataList, 'goodsNameKey', response.goodsNameKey)
+                  this.$set(this.dataList, 'grade', response.grade)
+                  this.$set(this.dataList, 'gradeKey', response.gradeKey)
+                  this.$set(this.dataList, 'waterContent', response.waterContent)
+                  this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
+                  this.$set(this.dataList, 'weight', response.weight)
+                  this.$set(
+                    this.dataList,
+                    'unitPrice',
+                    response.unitContractPrice
+                  )
+                })
+            }
+          }
+        }
+      },
+      selectwarehouseName(e) {
+        for (var i = 0; i < this.warehouseNameList.length; i++) {
+          if (this.warehouseNameList[i].id == e) {
+            this.dataList.warehouseName = this.warehouseNameList[i].warehouseName
+            //经办人
+            getstaff({
+                compId: sessionStorage.getItem('ws-pf_compId'),
+                warehouseId: e
+              })
               .toPromise()
               .then(response => {
-                this.$set(this.dataList1, 'goodsName', response.goodsName)
-                this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
-                this.$set(this.dataList1, 'grade', response.grade)
-                this.$set(this.dataList1, 'gradeKey', response.gradeKey)
-                this.$set(this.dataList1, 'waterContent', response.waterContent)
-                this.$set(this.dataList1, 'bulkDensity', response.bulkDensity)
-                this.$set(this.dataList1, 'weight', response.weight)
-                this.$set(
-                  this.dataList1,
-                  'unitPrice',
-                  response.unitContractPrice
-                )
+                this.options = response
+                this.staffList = response
+                //  this.agent = response
               })
           }
         }
-      }
-    },
-    selectstaff(e) {
-      for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
-          this.dataList.agentKey = this.staffList[i].staffId
+      },
+      selectwarehouseName1(e) {
+        for (var i = 0; i < this.warehouseNameList.length; i++) {
+          if (this.warehouseNameList[i].id == e) {
+            this.dataList1.warehouseName = this.warehouseNameList[i].warehouseName
+            //经办人
+            getstaff({
+                compId: sessionStorage.getItem('ws-pf_compId'),
+                warehouseId: e
+              })
+              .toPromise()
+              .then(response => {
+                this.options1 = response
+                this.staffList1 = response
+                //  this.agent = response
+              })
+          }
         }
-      }
-    },
-    selectstaff1(e) {
-      for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
-          this.dataList1.agentKey = this.staffList[i].staffId
+      },
+      changecontract1(e) {
+        if (this.dataList1.taskTypeKey != 3) {
+          for (let i = 0; i < this.contractNoList.length; i++) {
+            if (this.contractNoList[i].contractNo == e) {
+              getGoodsName({
+                  contractId: this.contractNoList[i].id,
+                  contractNo: this.contractNoList[i].contractNo
+                })
+                .toPromise()
+                .then(response => {
+                  this.$set(this.dataList1, 'goodsName', response.goodsName)
+                  this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
+                  this.$set(this.dataList1, 'grade', response.grade)
+                  this.$set(this.dataList1, 'gradeKey', response.gradeKey)
+                  this.$set(this.dataList1, 'waterContent', response.waterContent)
+                  this.$set(this.dataList1, 'bulkDensity', response.bulkDensity)
+                  this.$set(this.dataList1, 'weight', response.weight)
+                  this.$set(
+                    this.dataList1,
+                    'unitPrice',
+                    response.unitContractPrice
+                  )
+                })
+            }
+          }
         }
-      }
-    },
-    requestadd(list, status) {
-      list.compId = sessionStorage.getItem('ws-pf_compId')
-      list.publisher =
-        sessionStorage.getItem('ws-pf_roleName') +
-        sessionStorage.getItem('ws-pf_staffName')
-      addoreditoutput(list)
-        .toPromise()
-        .then(response => {
-          var that = this
-          this.$message.success('添加成功')
-          setTimeout(function() {
-            that.dataList={taskTypeKey:1}
-            that.dataList1={}
-            that.$router.push({ path: 'tranManagementWarehouseInOuttask' })
-          }, 2000)
-        })
-    },
-    //提交按钮
-    submit() {
-      if (this.dataList.taskTypeKey == 1) {
-        if (!this.dataList.warehouseName) {
-          this.$message({
-            message: '仓库名不能为空！',
-            type: 'warning'
-          })
-          return
+      },
+      selectstaff(e) {
+        for (var i = 0; i < this.staffList.length; i++) {
+          if (this.staffList[i].staffName == e) {
+            this.dataList.agentKey = this.staffList[i].staffId
+          }
         }
-        if (!this.dataList.contractNo) {
-          this.$message({
-            message: '合同编号不能为空！',
-            type: 'warning'
-          })
-          return
+      },
+      selectstaff1(e) {
+        for (var i = 0; i < this.staffList.length; i++) {
+          if (this.staffList[i].staffName == e) {
+            this.dataList1.agentKey = this.staffList[i].staffId
+          }
         }
-        if (!this.dataList.weight) {
-          this.$message({
-            message: '重量（吨）不能为空！',
-            type: 'warning'
+      },
+      requestadd(list, status) {
+        list.compId = sessionStorage.getItem('ws-pf_compId')
+        list.publisher =
+          sessionStorage.getItem('ws-pf_roleName') +
+          sessionStorage.getItem('ws-pf_staffName')
+        addoreditoutput(list)
+          .toPromise()
+          .then(response => {
+            var that = this
+            this.$message.success('添加成功')
+            setTimeout(function() {
+              that.dataList = {
+                taskTypeKey: 1
+              }
+              that.dataList1 = {}
+              that.$router.push({
+                path: 'tranManagementWarehouseInOuttask'
+              })
+            }, 2000)
           })
-          return
-        }
-        if (
-          isNaN(this.dataList.weight) ||
-          (String(this.dataList.weight).indexOf('.') != -1 &&
-            String(this.dataList.weight).length -
+      },
+      //提交按钮
+      submit() {
+        if (this.dataList.taskTypeKey == 1) {
+          if (!this.dataList.warehouseName) {
+            this.$message({
+              message: '仓库名不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.contractNo) {
+            this.$message({
+              message: '合同编号不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.weight) {
+            this.$message({
+              message: '重量（吨）不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            isNaN(this.dataList.weight) ||
+            (String(this.dataList.weight).indexOf('.') != -1 &&
+              String(this.dataList.weight).length -
               (String(this.dataList.weight).indexOf('.') + 1) >
               2) ||
-          this.dataList.weight < 0 ||
-          this.dataList.weight > 200000
-        ) {
-          this.$message({
-            message: '重量输入有误！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList.bulkDensity) {
-          this.$message({
-            message: '容重不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          this.dataList.bulkDensity < 500 ||
-          this.dataList.bulkDensity > 1000
-        ) {
-          this.$message({
-            message: '容重输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          String(this.dataList.bulkDensity).indexOf('.') != -1 &&
-          String(this.dataList.bulkDensity).length -
+            this.dataList.weight < 0 ||
+            this.dataList.weight > 200000
+          ) {
+            this.$message({
+              message: '重量输入有误！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.bulkDensity) {
+            this.$message({
+              message: '容重不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            this.dataList.bulkDensity < 500 ||
+            this.dataList.bulkDensity > 1000
+          ) {
+            this.$message({
+              message: '容重输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            String(this.dataList.bulkDensity).indexOf('.') != -1 &&
+            String(this.dataList.bulkDensity).length -
             (String(this.dataList.bulkDensity).indexOf('.') + 1) >
             0
-        ) {
-          this.$message({
-            message: '容重需输入整数',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList.waterContent) {
-          this.$message({
-            message: '水分不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (this.dataList.waterContent < 0 || this.dataList.waterContent > 40) {
-          this.$message({
-            message: '水分输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          String(this.dataList.waterContent).indexOf('.') != -1 &&
-          String(this.dataList.waterContent).length -
+          ) {
+            this.$message({
+              message: '容重需输入整数',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.waterContent) {
+            this.$message({
+              message: '水分不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (this.dataList.waterContent < 0 || this.dataList.waterContent > 40) {
+            this.$message({
+              message: '水分输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            String(this.dataList.waterContent).indexOf('.') != -1 &&
+            String(this.dataList.waterContent).length -
             (String(this.dataList.waterContent).indexOf('.') + 1) >
             1
-        ) {
-          this.$message({
-            message: '水分输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList.unitPrice) {
-          this.$message({
-            message: '单价不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          (this.dataList.unitPrice &&
-            String(this.dataList.unitPrice).indexOf('.') != -1 &&
-            String(this.dataList.unitPrice).length -
+          ) {
+            this.$message({
+              message: '水分输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.unitPrice) {
+            this.$message({
+              message: '单价不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            (this.dataList.unitPrice &&
+              String(this.dataList.unitPrice).indexOf('.') != -1 &&
+              String(this.dataList.unitPrice).length -
               (String(this.dataList.unitPrice).indexOf('.') + 1) >
               2) ||
-          this.dataList.unitPrice > 100000 ||
-          this.dataList.unitPrice < 1
-        ) {
-          this.$message({
-            message: '单价输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList.predictDate) {
-          this.$message({
-            message: '预计出库日期不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList.agent) {
-          this.$message({
-            message: '出库经办人不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList.businessDescribe) {
-          this.$message({
-            message: '业务描述不能为空！',
-            type: 'warning'
-          })
-          return
+            this.dataList.unitPrice > 100000 ||
+            this.dataList.unitPrice < 1
+          ) {
+            this.$message({
+              message: '单价输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.predictDate) {
+            this.$message({
+              message: '预计出库日期不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.agent) {
+            this.$message({
+              message: '出库经办人不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.businessDescribe) {
+            this.$message({
+              message: '业务描述不能为空！',
+              type: 'warning'
+            })
+            return
+          }
         }
-      }
 
-      if (this.dataList.taskTypeKey == 2) {
-        if (!this.dataList1.warehouseName) {
-          this.$message({
-            message: '仓库名不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.contractNo) {
-          this.$message({
-            message: '合同编号不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.weight) {
-          this.$message({
-            message: '重量（吨）不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          isNaN(this.dataList1.weight) ||
-          (String(this.dataList1.weight).indexOf('.') != -1 &&
-            String(this.dataList1.weight).length -
+        if (this.dataList.taskTypeKey == 2) {
+          if (!this.dataList1.warehouseName) {
+            this.$message({
+              message: '仓库名不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.contractNo) {
+            this.$message({
+              message: '合同编号不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.weight) {
+            this.$message({
+              message: '重量（吨）不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            isNaN(this.dataList1.weight) ||
+            (String(this.dataList1.weight).indexOf('.') != -1 &&
+              String(this.dataList1.weight).length -
               (String(this.dataList1.weight).indexOf('.') + 1) >
               2) ||
-          this.dataList1.weight < 0 ||
-          this.dataList1.weight > 200000
-        ) {
-          this.$message({
-            message: '重量输入有误！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.bulkDensity) {
-          this.$message({
-            message: '容重不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          this.dataList1.bulkDensity < 500 ||
-          this.dataList1.bulkDensity > 1000
-        ) {
-          this.$message({
-            message: '容重输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
-          String(this.dataList1.bulkDensity).length -
+            this.dataList1.weight < 0 ||
+            this.dataList1.weight > 200000
+          ) {
+            this.$message({
+              message: '重量输入有误！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.bulkDensity) {
+            this.$message({
+              message: '容重不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            this.dataList1.bulkDensity < 500 ||
+            this.dataList1.bulkDensity > 1000
+          ) {
+            this.$message({
+              message: '容重输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
+            String(this.dataList1.bulkDensity).length -
             (String(this.dataList1.bulkDensity).indexOf('.') + 1) >
             0
-        ) {
-          this.$message({
-            message: '容重需输入整数',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.waterContent) {
-          this.$message({
-            message: '水分不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          this.dataList1.waterContent < 0 ||
-          this.dataList1.waterContent > 40
-        ) {
-          this.$message({
-            message: '水分输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          String(this.dataList1.waterContent).indexOf('.') != -1 &&
-          String(this.dataList1.waterContent).length -
+          ) {
+            this.$message({
+              message: '容重需输入整数',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.waterContent) {
+            this.$message({
+              message: '水分不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            this.dataList1.waterContent < 0 ||
+            this.dataList1.waterContent > 40
+          ) {
+            this.$message({
+              message: '水分输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            String(this.dataList1.waterContent).indexOf('.') != -1 &&
+            String(this.dataList1.waterContent).length -
             (String(this.dataList1.waterContent).indexOf('.') + 1) >
             1
-        ) {
-          this.$message({
-            message: '水分输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.unitPrice) {
-          this.$message({
-            message: '单价不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          (this.dataList1.unitPrice &&
-            String(this.dataList1.unitPrice).indexOf('.') != -1 &&
-            String(this.dataList1.unitPrice).length -
+          ) {
+            this.$message({
+              message: '水分输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.unitPrice) {
+            this.$message({
+              message: '单价不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            (this.dataList1.unitPrice &&
+              String(this.dataList1.unitPrice).indexOf('.') != -1 &&
+              String(this.dataList1.unitPrice).length -
               (String(this.dataList1.unitPrice).indexOf('.') + 1) >
               2) ||
-          this.dataList1.unitPrice > 100000 ||
-          this.dataList1.unitPrice < 1
-        ) {
-          this.$message({
-            message: '单价输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.predictDate) {
-          this.$message({
-            message: '预计入库日期不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.agent) {
-          this.$message({
-            message: '入库经办人不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.businessDescribe) {
-          this.$message({
-            message: '业务描述不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-      }
-      if (this.dataList.taskTypeKey == 3) {
-        if (!this.dataList.warehouseName) {
-          this.$message({
-            message: '出库仓库名不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.warehouseName) {
-          this.$message({
-            message: '入库仓库名不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.moveTaskNo) {
-          this.$message({
-            message: '移库任务编号不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.weight) {
-          this.$message({
-            message: '重量（吨）不能为空！',
-            type: 'warning'
-          })
-          return
+            this.dataList1.unitPrice > 100000 ||
+            this.dataList1.unitPrice < 1
+          ) {
+            this.$message({
+              message: '单价输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.predictDate) {
+            this.$message({
+              message: '预计入库日期不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.agent) {
+            this.$message({
+              message: '入库经办人不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.businessDescribe) {
+            this.$message({
+              message: '业务描述不能为空！',
+              type: 'warning'
+            })
+            return
+          }
         }
-        if (
-          isNaN(this.dataList1.weight) ||
-          (String(this.dataList1.weight).indexOf('.') != -1 &&
-            String(this.dataList1.weight).length -
+        if (this.dataList.taskTypeKey == 3) {
+          if (!this.dataList.warehouseName) {
+            this.$message({
+              message: '出库仓库名不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.warehouseName) {
+            this.$message({
+              message: '入库仓库名不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.moveTaskNo) {
+            this.$message({
+              message: '移库任务编号不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.weight) {
+            this.$message({
+              message: '重量（吨）不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            isNaN(this.dataList1.weight) ||
+            (String(this.dataList1.weight).indexOf('.') != -1 &&
+              String(this.dataList1.weight).length -
               (String(this.dataList1.weight).indexOf('.') + 1) >
               2) ||
-          this.dataList1.weight < 0 ||
-          this.dataList1.weight > 200000
-        ) {
-          this.$message({
-            message: '重量输入有误！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.bulkDensity) {
-          this.$message({
-            message: '容重不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          this.dataList1.bulkDensity < 500 ||
-          this.dataList1.bulkDensity > 1000
-        ) {
-          this.$message({
-            message: '容重输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
-          String(this.dataList1.bulkDensity).length -
+            this.dataList1.weight < 0 ||
+            this.dataList1.weight > 200000
+          ) {
+            this.$message({
+              message: '重量输入有误！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.bulkDensity) {
+            this.$message({
+              message: '容重不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            this.dataList1.bulkDensity < 500 ||
+            this.dataList1.bulkDensity > 1000
+          ) {
+            this.$message({
+              message: '容重输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
+            String(this.dataList1.bulkDensity).length -
             (String(this.dataList1.bulkDensity).indexOf('.') + 1) >
             0
-        ) {
-          this.$message({
-            message: '容重需输入整数',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.waterContent) {
-          this.$message({
-            message: '水分不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          this.dataList1.waterContent < 0 ||
-          this.dataList1.waterContent > 40
-        ) {
-          this.$message({
-            message: '水分输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          String(this.dataList1.waterContent).indexOf('.') != -1 &&
-          String(this.dataList1.waterContent).length -
+          ) {
+            this.$message({
+              message: '容重需输入整数',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.waterContent) {
+            this.$message({
+              message: '水分不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            this.dataList1.waterContent < 0 ||
+            this.dataList1.waterContent > 40
+          ) {
+            this.$message({
+              message: '水分输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            String(this.dataList1.waterContent).indexOf('.') != -1 &&
+            String(this.dataList1.waterContent).length -
             (String(this.dataList1.waterContent).indexOf('.') + 1) >
             1
-        ) {
-          this.$message({
-            message: '水分输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.unitPrice) {
-          this.$message({
-            message: '单价不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          (this.dataList1.unitPrice &&
-            String(this.dataList1.unitPrice).indexOf('.') != -1 &&
-            String(this.dataList1.unitPrice).length -
+          ) {
+            this.$message({
+              message: '水分输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.unitPrice) {
+            this.$message({
+              message: '单价不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            (this.dataList1.unitPrice &&
+              String(this.dataList1.unitPrice).indexOf('.') != -1 &&
+              String(this.dataList1.unitPrice).length -
               (String(this.dataList1.unitPrice).indexOf('.') + 1) >
               2) ||
-          this.dataList1.unitPrice > 100000 ||
-          this.dataList1.unitPrice < 1
-        ) {
-          this.$message({
-            message: '单价输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList.predictDate) {
-          this.$message({
-            message: '预计出库日期不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.predictDate) {
-          this.$message({
-            message: '预计入库日期不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList.agent) {
-          this.$message({
-            message: '出库经办人不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.agent) {
-          this.$message({
-            message: '入库经办人不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.businessDescribe) {
-          this.$message({
-            message: '业务描述不能为空！',
-            type: 'warning'
-          })
-          return
+            this.dataList1.unitPrice > 100000 ||
+            this.dataList1.unitPrice < 1
+          ) {
+            this.$message({
+              message: '单价输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.predictDate) {
+            this.$message({
+              message: '预计出库日期不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.predictDate) {
+            this.$message({
+              message: '预计入库日期不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.agent) {
+            this.$message({
+              message: '出库经办人不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.agent) {
+            this.$message({
+              message: '入库经办人不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.businessDescribe) {
+            this.$message({
+              message: '业务描述不能为空！',
+              type: 'warning'
+            })
+            return
+          }
         }
-      }
 
-      if (this.dataList1.taskTypeKey == 4) {
-        if (!this.dataList.warehouseName) {
-          this.$message({
-            message: '出库仓库名不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.warehouseName) {
-          this.$message({
-            message: '入库仓库名不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.contractNo) {
-          this.$message({
-            message: '合同编号不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList.contractNo) {
-          this.$message({
-            message: '合同编号不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.weight) {
-          this.$message({
-            message: '重量（吨）不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          isNaN(this.dataList1.weight) ||
-          (String(this.dataList1.weight).indexOf('.') != -1 &&
-            String(this.dataList1.weight).length -
+        if (this.dataList1.taskTypeKey == 4) {
+          if (!this.dataList.warehouseName) {
+            this.$message({
+              message: '出库仓库名不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.warehouseName) {
+            this.$message({
+              message: '入库仓库名不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.contractNo) {
+            this.$message({
+              message: '合同编号不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.contractNo) {
+            this.$message({
+              message: '合同编号不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.weight) {
+            this.$message({
+              message: '重量（吨）不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            isNaN(this.dataList1.weight) ||
+            (String(this.dataList1.weight).indexOf('.') != -1 &&
+              String(this.dataList1.weight).length -
               (String(this.dataList1.weight).indexOf('.') + 1) >
               2) ||
-          this.dataList1.weight < 0 ||
-          this.dataList1.weight > 200000
-        ) {
-          this.$message({
-            message: '重量输入有误！',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.bulkDensity) {
-          this.$message({
-            message: '容重不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          this.dataList1.bulkDensity < 500 ||
-          this.dataList1.bulkDensity > 1000
-        ) {
-          this.$message({
-            message: '容重输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
-          String(this.dataList1.bulkDensity).length -
+            this.dataList1.weight < 0 ||
+            this.dataList1.weight > 200000
+          ) {
+            this.$message({
+              message: '重量输入有误！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.bulkDensity) {
+            this.$message({
+              message: '容重不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            this.dataList1.bulkDensity < 500 ||
+            this.dataList1.bulkDensity > 1000
+          ) {
+            this.$message({
+              message: '容重输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
+            String(this.dataList1.bulkDensity).length -
             (String(this.dataList1.bulkDensity).indexOf('.') + 1) >
             0
-        ) {
-          this.$message({
-            message: '容重需输入整数',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.waterContent) {
-          this.$message({
-            message: '水分不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          this.dataList1.waterContent < 0 ||
-          this.dataList1.waterContent > 40
-        ) {
-          this.$message({
-            message: '水分输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          String(this.dataList1.waterContent).indexOf('.') != -1 &&
-          String(this.dataList1.waterContent).length -
+          ) {
+            this.$message({
+              message: '容重需输入整数',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.waterContent) {
+            this.$message({
+              message: '水分不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            this.dataList1.waterContent < 0 ||
+            this.dataList1.waterContent > 40
+          ) {
+            this.$message({
+              message: '水分输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            String(this.dataList1.waterContent).indexOf('.') != -1 &&
+            String(this.dataList1.waterContent).length -
             (String(this.dataList1.waterContent).indexOf('.') + 1) >
             1
-        ) {
-          this.$message({
-            message: '水分输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList1.unitPrice) {
-          this.$message({
-            message: '单价不能为空！',
-            type: 'warning'
-          })
-          return
-        }
-        if (
-          (this.dataList1.unitPrice &&
-            String(this.dataList1.unitPrice).indexOf('.') != -1 &&
-            String(this.dataList1.unitPrice).length -
+          ) {
+            this.$message({
+              message: '水分输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.unitPrice) {
+            this.$message({
+              message: '单价不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (
+            (this.dataList1.unitPrice &&
+              String(this.dataList1.unitPrice).indexOf('.') != -1 &&
+              String(this.dataList1.unitPrice).length -
               (String(this.dataList1.unitPrice).indexOf('.') + 1) >
               2) ||
-          this.dataList1.unitPrice > 100000 ||
-          this.dataList1.unitPrice < 1
-        ) {
-          this.$message({
-            message: '单价输入错误',
-            type: 'warning'
-          })
-          return
-        }
-        if (!this.dataList.predictDate) {
-          this.$message({
-            message: '预计出库日期不能为空！',
-            type: 'warning'
-          })
-          return
+            this.dataList1.unitPrice > 100000 ||
+            this.dataList1.unitPrice < 1
+          ) {
+            this.$message({
+              message: '单价输入错误',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.predictDate) {
+            this.$message({
+              message: '预计出库日期不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.predictDate) {
+            this.$message({
+              message: '预计入库日期不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.agent) {
+            this.$message({
+              message: '出库经办人不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList1.agent) {
+            this.$message({
+              message: '入库经办人不能为空！',
+              type: 'warning'
+            })
+            return
+          }
+          if (!this.dataList.businessDescribe) {
+            this.$message({
+              message: '业务描述不能为空！',
+              type: 'warning'
+            })
+            return
+          }
         }
-        if (!this.dataList1.predictDate) {
-          this.$message({
-            message: '预计入库日期不能为空！',
-            type: 'warning'
-          })
-          return
+        // this.dataList.goodsNameKey =
+        // this.dataList.positionId =
+        // this.dataList.baseId =
+        this.dataList.inOutFlag = 1
+        this.dataList1.inOutFlag = 2
+        if (this.dataList.taskTypeKey == 1) {
+          this.dataList.inOutTaskNo = this.inOutTaskNo
+          this.requestadd(this.dataList)
+        } else if (this.dataList1.taskTypeKey == 2) {
+          this.dataList1.inOutTaskNo = this.inOutTaskNo1
+          this.requestadd(this.dataList1)
+        } else if (
+          this.dataList.taskTypeKey == 3 ||
+          this.dataList.taskTypeKey == 4
+        ) {
+          this.dataList.inOutTaskNo = this.inOutTaskNo
+          this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
+          if (this.dataList.taskTypeKey == 3) {
+            this.dataList.businessDescribe = this.dataList1.businessDescribe
+          } else {
+            this.dataList1.businessDescribe = this.dataList.businessDescribe
+          }
+          this.requestadd(this.dataList, 'repetition')
+          this.dataList1.inOutTaskNo = this.inOutTaskNo1
+          this.dataList1.relevanceId = this.dataList.relevanceId
+          this.dataList1.goodsName = this.dataList.goodsName
+          this.requestadd(this.dataList1, 'repetition')
         }
-        if (!this.dataList.agent) {
-          this.$message({
-            message: '出库经办人不能为空！',
-            type: 'warning'
-          })
-          return
+      },
+      tarechange(e) {
+        if (this.dataList.grossWeight && this.dataList.tare) {
+          this.dataList.netWeight = Number(
+            this.dataList.grossWeight - this.dataList.tare
+          )
         }
-        if (!this.dataList1.agent) {
-          this.$message({
-            message: '入库经办人不能为空！',
-            type: 'warning'
-          })
-          return
+      },
+      grossWeightchange(e) {
+        if (this.dataList.grossWeight && this.dataList.tare) {
+          this.dataList.netWeight = Number(
+            this.dataList.grossWeight - this.dataList.tare
+          )
         }
-        if (!this.dataList.businessDescribe) {
-          this.$message({
-            message: '业务描述不能为空！',
-            type: 'warning'
-          })
-          return
+      },
+      selectgoodsName(e) {
+        for (var i = 0; i < this.goodnameList.length; i++) {
+          if (this.goodnameList[i].constValue == e) {
+            this.dataList.goodsNameKey = this.goodnameList[i].constKey
+          }
         }
-      }
-      // this.dataList.goodsNameKey =
-      // this.dataList.positionId = 
-      // this.dataList.baseId = 
-      this.dataList.inOutFlag = 1
-      this.dataList1.inOutFlag = 2
-      if (this.dataList.taskTypeKey == 1) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
-        this.requestadd(this.dataList)
-      } else if (this.dataList1.taskTypeKey == 2) {
-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
-        this.requestadd(this.dataList1)
-      } else if (
-        this.dataList.taskTypeKey == 3 ||
-        this.dataList.taskTypeKey == 4
-      ) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
-        this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-        if (this.dataList.taskTypeKey == 3) {
-          this.dataList.businessDescribe = this.dataList1.businessDescribe
-        } else {
-          this.dataList1.businessDescribe = this.dataList.businessDescribe
+      },
+      selectgoodsName1(e) {
+        for (var i = 0; i < this.goodnameList.length; i++) {
+          if (this.goodnameList[i].constValue == e) {
+            this.dataList1.goodsNameKey = this.goodnameList[i].constKey
+          }
         }
-        this.requestadd(this.dataList, 'repetition')
-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
-        this.dataList1.relevanceId = this.dataList.relevanceId
-        this.dataList1.goodsName = this.dataList.goodsName
-        this.requestadd(this.dataList1, 'repetition')
-      }
-    },
-    tarechange(e) {
-      if (this.dataList.grossWeight && this.dataList.tare) {
-        this.dataList.netWeight = Number(
-          this.dataList.grossWeight - this.dataList.tare
-        )
-      }
-    },
-    grossWeightchange(e) {
-      if (this.dataList.grossWeight && this.dataList.tare) {
-        this.dataList.netWeight = Number(
-          this.dataList.grossWeight - this.dataList.tare
-        )
-      }
-    },
-    selectgoodsName(e) {
-      for (var i = 0; i < this.goodnameList.length; i++) {
-        if (this.goodnameList[i].constValue == e) {
-          this.dataList.goodsNameKey = this.goodnameList[i].constKey
+      },
+      selectpackingMethod(e) {
+        for (var i = 0; i < this.gradeList.length; i++) {
+          if (this.gradeList[i].constValue == e) {
+            this.dataList.gradeKey = this.gradeList[i].constKey
+            if (this.dataList.taskTypeKey == 3) {
+              this.$set(this.dataList1, 'grade', e)
+              this.$set(this.dataList1, 'gradeKey', this.gradeList[i].constKey)
+            }
+          }
         }
-      }
-    },
-    selectgoodsName1(e) {
-      for (var i = 0; i < this.goodnameList.length; i++) {
-        if (this.goodnameList[i].constValue == e) {
-          this.dataList1.goodsNameKey = this.goodnameList[i].constKey
+      },
+      selectpackingMethod1(e) {
+        for (var i = 0; i < this.gradeList.length; i++) {
+          if (this.gradeList[i].constValue == e) {
+            this.dataList1.packingMethodKey = this.gradeList[i].constKey
+            if (this.dataList1.taskTypeKey == 4) {
+              this.$set(this.dataList, 'grade', e)
+              this.$set(this.dataList, 'gradeKey', this.gradeList[i].constKey)
+            }
+          }
         }
-      }
-    },
-    selectpackingMethod(e) {
-      for (var i = 0; i < this.gradeList.length; i++) {
-        if (this.gradeList[i].constValue == e) {
-          this.dataList.gradeKey = this.gradeList[i].constKey
-          if (this.dataList.taskTypeKey == 3) {
-            this.$set(this.dataList1, 'grade', e)
-            this.$set(this.dataList1, 'gradeKey', this.gradeList[i].constKey)
+      },
+      selectstorageType(e) {
+        switch (e) {
+          case '采购出库':
+            this.flag = 0
+            break
+          case '销售出库':
+            this.flag = 1
+            break
+        }
+        for (var i = 0; i < this.storageType.length; i++) {
+          if (this.storageType[i].constValue == e) {
+            this.dataList.inOutTypeKey = this.storageType[i].constKey
           }
         }
-      }
-    },
-    selectpackingMethod1(e) {
-      for (var i = 0; i < this.gradeList.length; i++) {
-        if (this.gradeList[i].constValue == e) {
-          this.dataList1.packingMethodKey = this.gradeList[i].constKey
-          if (this.dataList1.taskTypeKey == 4) {
-            this.$set(this.dataList, 'grade', e)
-            this.$set(this.dataList, 'gradeKey', this.gradeList[i].constKey)
+      },
+      selectstorageType1(e) {debugger
+        switch (e) {
+          case '采购入库':
+            this.flag = 0
+            break
+          case '退库':
+            this.flag = 2
+            break
+        }
+        for (var i = 0; i < this.storageType1.length; i++) {
+          if (this.storageType1[i].constValue == e) {
+            this.dataList1.inOutTypeKey = this.storageType1[i].constKey
           }
         }
-      }
-    },
-    selectstorageType(e) {
-      switch (e) {
-        case '采购出库':
-          this.flag = 0
-          break
-        case '销售出库':
+      },
+      handleClose() {
+        this.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      businessDescriptionchange(e) {
+        console.log(e)
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      tasknumber() {
+        if (this.dataList.taskTypeKey == 1) {
+          this.inOutTaskNo = 'CK' + this.getdate() + this.MathRand()
+        } else if (this.dataList.taskTypeKey == 2) {
+          this.inOutTaskNo1 = 'RK' + this.getdate() + this.MathRand()
+        } else if (this.dataList.taskTypeKey == 3) {
+          var random = this.getdate() + this.MathRand()
+          this.inOutTaskNo = 'YKC' + random
+          this.inOutTaskNo1 = 'YKR' + random
+        } else if (this.dataList.taskTypeKey == 4) {
+          var random = this.getdate() + this.MathRand()
+          this.inOutTaskNo = 'TCC' + random
+          this.inOutTaskNo1 = 'TCR' + random
+        }
+      },
+      tasktypechange(e) {
+        if (!this.$route.query.relevanceId) {
+          this.tasknumber()
+        }
+        this.dataList1.taskTypeKey = e
+        if (this.dataList.taskTypeKey == 1) {
+          this.dataList.inOutType = '销售出库'
+          this.dataList.inOutTypeKey = '1'
           this.flag = 1
-          break
-      }
-      for (var i = 0; i < this.storageType.length; i++) {
-        if (this.storageType[i].constValue == e) {
-          this.dataList.inOutTypeKey = this.storageType[i].constKey
         }
-      }
-    },
-    selectstorageType1(e) {
-      switch (e) {
-        case '采购入库':
+        if (this.dataList1.taskTypeKey == 2) {
+          this.dataList1.inOutType = '采购入库'
+          this.dataList1.inOutTypeKey = '1'
           this.flag = 0
-          break
-        case '退库':
+        } else if (this.dataList1.taskTypeKey == 3) {
+          this.disabled = true
+          this.dataList1.inOutType = '移库入库'
+          this.dataList1.inOutTypeKey = '3'
+          this.dataList.inOutType = '移库出库'
+          this.dataList.inOutTypeKey = '3'
+        } else if (this.dataList1.taskTypeKey == 4) {
+          this.disabled = true
+          this.dataList1.inOutType = '退库'
+          this.dataList1.inOutTypeKey = '6'
+          this.dataList.inOutType = '销售出库'
           this.flag = 2
-          break
-      }
-      for (var i = 0; i < this.storageType1.length; i++) {
-        if (this.storageType1[i].constValue == e) {
-          this.dataList1.inOutTypeKey = this.storageType1[i].constKey
+          this.dataList.inOutTypeKey = '1'
         }
-      }
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    businessDescriptionchange(e) {
-      console.log(e)
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    tasknumber() {
-      if (this.dataList.taskTypeKey == 1) {
-        this.inOutTaskNo = 'CK' + this.getdate() + this.MathRand()
-      } else if (this.dataList.taskTypeKey == 2) {
-        this.inOutTaskNo1 = 'RK' + this.getdate() + this.MathRand()
-      } else if (this.dataList.taskTypeKey == 3) {
-        var random = this.getdate() + this.MathRand()
-        this.inOutTaskNo = 'YKC' + random
-        this.inOutTaskNo1 = 'YKR' + random
-      } else if (this.dataList.taskTypeKey == 4) {
-        var random = this.getdate() + this.MathRand()
-        this.inOutTaskNo = 'TCC' + random
-        this.inOutTaskNo1 = 'TCR' + random
-      }
-    },
-    tasktypechange(e) {
-      if (!this.$route.query.relevanceId) {
+      },
+      GetRandomNum(Min, Max) {
+        var Range = Max - Min
+        var Rand = Math.random()
+        return Min + Math.round(Rand * Range)
+      },
+      getList() {
         this.tasknumber()
-      }
-      this.dataList1.taskTypeKey = e
-      if (this.dataList.taskTypeKey == 1) {
-        this.dataList.inOutType = '销售出库'
-        this.dataList.inOutTypeKey = '1'
-        this.flag = 1
-      }
-      if (this.dataList1.taskTypeKey == 2) {
-        this.dataList1.inOutType = '采购入库'
-        this.dataList1.inOutTypeKey = '1'
-        this.flag = 0
-      } else if (this.dataList1.taskTypeKey == 3) {
-        this.disabled = true
-        this.dataList1.inOutType = '移库入库'
-        this.dataList1.inOutTypeKey = '3'
-        this.dataList.inOutType = '移库出库'
-        this.dataList.inOutTypeKey = '3'
-      } else if (this.dataList1.taskTypeKey == 4) {
-        this.disabled = true
-        this.dataList1.inOutType = '退库'
-        this.dataList1.inOutTypeKey = '6'
-        this.dataList.inOutType = '销售出库'
-        this.flag = 2
-        this.dataList.inOutTypeKey = '1'
-      }
-    },
-    GetRandomNum(Min, Max) {
-      var Range = Max - Min
-      var Rand = Math.random()
-      return Min + Math.round(Rand * Range)
-    },
-    getList() {
-      this.tasknumber()
-      this.$set(this.dataList, 'inOutType', '销售出库')
-      this.$set(this.dataList, 'inOutTypeKey', '1')
-      this.$set(this.dataList, 'goodsName', '玉米')
-      this.$set(this.dataList, 'goodsNameKey', '1')
-      this.$set(this.dataList, 'grade', '一等品')
-      this.$set(this.dataList, 'gradeKey', '1')
-      this.$set(this.dataList1, 'goodsName', '玉米')
-      this.$set(this.dataList1, 'goodsNameKey', '1')
-      this.$set(this.dataList1, 'grade', '一等品')
-      this.$set(this.dataList1, 'gradeKey', '1')
-      // 货名
-      pullDown({ constId: 'CON2' })
-        .toPromise()
-        .then(response => {
-          this.goodnameList = response
-        })
-      // 品级
-      pullDown({ constId: 'CON3' })
-        .toPromise()
-        .then(response => {
-          this.gradeList = response
-        })
-      pullDown({ constId: 'CON6' })
-        .toPromise()
-        .then(response => {
-          this.storageType = response
-        })
-      pullDown({ constId: 'CON5' })
-        .toPromise()
-        .then(response => {
-          this.storageType1 = response
-        })
-      xialaNo({
-        compId: this.compId,
-        flag: this.flag
-      })
-        .toPromise()
-        .then(response => {
-          this.contractNoList = response
-          // this.contractNoList1 = response
-        })
-      // //临时仓库入库类型
-      // pullDown({ constId: 'WARE1' })
-      //   .toPromise()
-      //   .then((response) => {
-      //     this.storageType = respons
-      //   })
-      // //临时仓库出库类型
-      // pullDown({ constId: 'WARE2' })
-      //   .toPromise()
-      //   .then((response) => {
-      //     this.deliveryType = response
-      //   })
-      //仓库名
-      getwarehousename({
-        compId: this.compId,
-        warehouseType: 1
-      })
-        .toPromise()
-        .then(response => {
-          this.warehouseNameList = response
-          getwarehousename({
+        this.$set(this.dataList, 'inOutType', '销售出库')
+        this.$set(this.dataList, 'inOutTypeKey', '1')
+        this.$set(this.dataList, 'goodsName', '玉米')
+        this.$set(this.dataList, 'goodsNameKey', '1')
+        this.$set(this.dataList, 'grade', '一等品')
+        this.$set(this.dataList, 'gradeKey', '1')
+        this.$set(this.dataList1, 'goodsName', '玉米')
+        this.$set(this.dataList1, 'goodsNameKey', '1')
+        this.$set(this.dataList1, 'grade', '一等品')
+        this.$set(this.dataList1, 'gradeKey', '1')
+        // 货名
+        pullDown({
+            constId: 'CON2'
+          })
+          .toPromise()
+          .then(response => {
+            this.goodnameList = response
+          })
+        // 品级
+        pullDown({
+            constId: 'CON3'
+          })
+          .toPromise()
+          .then(response => {
+            this.gradeList = response
+          })
+        pullDown({
+            constId: 'CON6'
+          })
+          .toPromise()
+          .then(response => {
+            this.storageType = response
+          })
+        pullDown({
+            constId: 'CON5'
+          })
+          .toPromise()
+          .then(response => {
+            this.storageType1 = response
+          })
+        xialaNo({
             compId: this.compId,
-            warehouseType: 2
+            flag: this.flag
           })
-            .toPromise()
-            .then(response => {
-              for (var i = 0; i < response.length; i++) {
-                this.warehouseNameList.push(response[i])
-              }
-            })
-        })
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
+          .toPromise()
+          .then(response => {
+            this.contractNoList = response
+            // this.contractNoList1 = response
+          })
+        // //临时仓库入库类型
+        // pullDown({ constId: 'WARE1' })
+        //   .toPromise()
+        //   .then((response) => {
+        //     this.storageType = respons
+        //   })
+        // //临时仓库出库类型
+        // pullDown({ constId: 'WARE2' })
+        //   .toPromise()
+        //   .then((response) => {
+        //     this.deliveryType = response
+        //   })
+        //仓库名
+        getwarehousename({
+            compId: this.compId,
+            warehouseType: 1
+          })
+          .toPromise()
+          .then(response => {
+            this.warehouseNameList = response
+            getwarehousename({
+                compId: this.compId,
+                warehouseType: 2
+              })
+              .toPromise()
+              .then(response => {
+                for (var i = 0; i < response.length; i++) {
+                  this.warehouseNameList.push(response[i])
+                }
+              })
+          })
+      },
+      selecttaskType(e) {
+        for (var i = 0; i < this.taskTypeList.length; i++) {
+          if (this.taskTypeList[i].value == e) {
+            this.searchType = this.taskTypeList[i].type
+          }
         }
-      }
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id }
-      })
-    },
-
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then(response => {
-          this.historyList = response
+      },
+      fujian(row) {
+        if (
+          row.receiveAttachmentPath === null ||
+          row.receiveAttachmentPath === ''
+        ) {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accessoryTFs = true
+        }
+        this.appendixIdss = row.receiveAttachmentPath
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          query: {
+            id: row.id
+          }
         })
+      },
+
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
+      history(row) {
+        console.log(row)
+        billoperatehis({
+            id: row.id
+          })
+          .toPromise()
+          .then(response => {
+            this.historyList = response
+          })
+      }
     }
   }
-}
 </script>
 <style lang="scss" scoped>
-/deep/.basicInformation {
-  .el-info-table {
-    border: none;
+  /deep/.basicInformation {
+    .el-info-table {
+      border: none;
+      position: relative;
+    }
+
+    .el-form-item {
+      width: 33.3333%;
+      border: none;
+      margin: 0;
+
+      .el-form-item__label {
+        text-align: left;
+        font-size: 14px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #8890b1;
+      }
+
+      .el-form-item__content {
+        padding-left: 0px;
+        padding-right: 10px;
+        // background: #fff;
+        white-space: nowrap;
+        height: 40px;
+        display: flex;
+        -webkit-box-align: center;
+        align-items: center;
+        text-align: left;
+        overflow: hidden;
+      }
+    }
+  }
+
+  /deep/.el-radio {
+    color: #606266;
+    font-weight: 500;
+    line-height: 1;
+    cursor: pointer;
+    white-space: nowrap;
+    outline: 0;
+    margin-right: 30px;
+    margin-top: 15px;
+  }
+
+  /deep/.el-radio__inner {
+    border: 1px solid #dcdfe6;
+    border-radius: 100%;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    cursor: pointer;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    margin-left: 100px;
+  }
+
+  /deep/.el-radio__input {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: 0;
+    line-height: 1;
+    vertical-align: middle;
+    margin-top: -1px;
+  }
+
+  .title {
     position: relative;
+    padding-left: 10px;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
   }
-  .el-form-item {
-    width: 33.3333%;
+
+  .el-form {
+    padding: 0 15%;
+    display: flex;
+    flex-wrap: wrap;
+    margin-left: -50px;
+    margin-top: 15px;
+    width: 110%;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-col {
+    background: #f6f7fc;
+  }
+
+  .bg-right {
+    text-align: right;
+    padding: 16px 20px;
+  }
+
+  .center {
+    position: relative;
+    top: 50px;
+    width: 40%;
+    height: 2000px;
+    margin: 0 auto;
+    margin-right: 180px;
+  }
+
+  /deep/.el-form-item__label {
+    width: 160px;
+  }
+
+  .inspector {
+    width: 50%;
+  }
+
+  /deep/.el-form-item--small .el-form-item__label,
+  .el-form-item--small .el-form-item__content {
+    text-align: left;
+  }
+
+  /deep/.el-input--small {
+    font-size: 13px;
+    position: relative;
+    display: inline-block;
+  }
+
+  .center1 .small-title {
+    margin-left: 323px;
+  }
+
+  .center1 {
+    width: 90%;
+    margin: 0 auto;
+    margin-left: 10px;
+    margin-top: 25px;
+  }
+
+  /deep/.el-input--small .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+  }
+
+  /deep/.el-select {
+    display: inline-block;
+    position: relative;
+    width: 100%;
+  }
+
+  .annu {
+    height: 81px;
+    background: #ffffff;
+    border-radius: 4px;
+  }
+
+  .basicInformation .el-form-item {
+    width: 50.3333%;
     border: none;
     margin: 0;
-    .el-form-item__label {
-      text-align: left;
-      font-size: 14px;
-      font-family: PingFangSC-Regular, PingFang SC;
-      font-weight: 400;
-      color: #8890b1;
-    }
-    .el-form-item__content {
-      padding-left: 0px;
-      padding-right: 10px;
-      // background: #fff;
-      white-space: nowrap;
-      height: 40px;
-      display: flex;
-      -webkit-box-align: center;
-      align-items: center;
-      text-align: left;
-      overflow: hidden;
-    }
   }
-}
-/deep/.el-radio {
-  color: #606266;
-  font-weight: 500;
-  line-height: 1;
-  cursor: pointer;
-  white-space: nowrap;
-  outline: 0;
-  margin-right: 30px;
-  margin-top: 15px;
-}
-/deep/.el-radio__inner {
-  border: 1px solid #dcdfe6;
-  border-radius: 100%;
-  width: 14px;
-  height: 14px;
-  background-color: #fff;
-  cursor: pointer;
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-  margin-left: 100px;
-}
-/deep/.el-radio__input {
-  white-space: nowrap;
-  cursor: pointer;
-  outline: 0;
-  line-height: 1;
-  vertical-align: middle;
-  margin-top: -1px;
-}
-.title {
-  position: relative;
-  padding-left: 10px;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.el-form {
-  padding: 0 15%;
-  display: flex;
-  flex-wrap: wrap;
-  margin-left: -50px;
-  margin-top: 15px;
-  width: 110%;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-col {
-  background: #f6f7fc;
-}
-.bg-right {
-  text-align: right;
-  padding: 16px 20px;
-}
-.center {
-  position: relative;
-  top: 50px;
-  width: 40%;
-  height: 2000px;
-  margin: 0 auto;
-  margin-right: 180px;
-}
-/deep/.el-form-item__label {
-  width: 160px;
-}
-.inspector {
-  width: 50%;
-}
-/deep/.el-form-item--small .el-form-item__label,
-.el-form-item--small .el-form-item__content {
-  text-align: left;
-}
-/deep/.el-input--small {
-  font-size: 13px;
-  position: relative;
-  display: inline-block;
-}
-.center1 .small-title {
-  margin-left: 323px;
-}
-.center1 {
-  width: 90%;
-  margin: 0 auto;
-  margin-left: 10px;
-  margin-top: 25px;
-}
-/deep/.el-input--small .el-input__inner {
-  height: 32px;
-  line-height: 32px;
-}
-/deep/.el-select {
-  display: inline-block;
-  position: relative;
-  width: 100%;
-}
-.annu {
-  height: 81px;
-  background: #ffffff;
-  border-radius: 4px;
-}
 
-.basicInformation .el-form-item {
-  width: 50.3333%;
-  border: none;
-  margin: 0;
-}
-.huom {
-  width: 100px;
-}
-.el-form {
-  font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-.a {
-  margin-left: -32px;
-}
-.el-radio-group {
-  margin-left: 251px;
-}
-.ding {
-  height: 23px;
-  background: #e8ecf6;
-  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
-}
-.winseaview-view {
-  padding: 0 0 20px;
-}
-.container {
-  overflow: scroll;
-  height: 93vh;
-}
-.el-radio-group {
-  font-size: 0;
-  margin-top: 20px;
-}
-/deep/.el-form {
-  padding: 0 15%;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  margin-left: 130px;
-  margin-top: 15px;
-  width: 110%;
-}
-</style>
+  .huom {
+    width: 100px;
+  }
+
+  .el-form {
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
+  }
+
+  .a {
+    margin-left: -32px;
+  }
+
+  .el-radio-group {
+    margin-left: 251px;
+  }
+
+  .ding {
+    height: 23px;
+    background: #e8ecf6;
+    box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+  }
+
+  .winseaview-view {
+    padding: 0 0 20px;
+  }
+
+  .container {
+    overflow: scroll;
+    height: 93vh;
+  }
+
+  .el-radio-group {
+    font-size: 0;
+    margin-top: 20px;
+  }
+
+  /deep/.el-form {
+    padding: 0 15%;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -ms-flex-wrap: wrap;
+    flex-wrap: wrap;
+    margin-left: 130px;
+    margin-top: 15px;
+    width: 110%;
+  }
+</style>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -909,7 +909,7 @@ export default {
   width: 72px;
 }
 /deep/.liaison .ws-info-table .el-form-item {
-  width: 16.66%;
+  width: 220px;
   color: #8890b1;
   font-size: 14px;
 }

src/views/warehouse/component/router/index.js

@@ -34,7 +34,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'costmanagement',
         shortcutEntrance: 'warehouseManagementList',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
+        module: 'warehouseManagement.costControl.View',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -365,7 +365,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'warehouseManagementPutOutLook',
         shortcutEntrance: 'warehouseManagementPutOutLook',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask.View',
+        module: 'warehouseManagement.warehouse.warehouseInfo',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -381,7 +381,7 @@ const warehouseManagementRouter = {
       meta: {
         title: 'tranManagementWarehouseInOutTask',
         shortcutEntrance: 'tranManagementWarehouseInOutTask',
-        module: 'warehouseManagement.warehouse.warehouseInfoTask',
+        module: 'warehouseManagement.warehouse.warehouseInfo',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/warehouse/costmanagement.vue

@@ -1,4 +1,4 @@
-<!--仓库管理-->
+<!--成本管理-->
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="15">
@@ -14,6 +14,8 @@
             <el-radio-button label="2">临时仓库</el-radio-button>
           </el-radio-group>
           <ws-button class="find" type="primary" @click="warehouselocation()"
+          v-hasPermission="
+           `warehouseManagement.costControl.add`"
           >库点费用</ws-button>
         </div>
       </template>
@@ -72,10 +74,10 @@
         <el-table-column prop="address" label="操作" width="200">
           <template slot-scope="scope">
             <div class="record" v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfo.view`
+           `warehouseManagement.costControl.edit`
           " @click="edit(scope.row)">修改</div>
             <div class="adjustment" v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfo.view`
+           `warehouseManagement.costControl.detail`
           " @click="weightedsubsidiary(scope.row)">加权明细</div>
           </template>
         </el-table-column>

src/views/warehouse/tranManagementWarehouseInOutTask.vue

@@ -128,16 +128,45 @@
         <el-table-column
           prop="publisher"
           class="table_td"
-          label="发布者"
-        ></el-table-column>
+          label="经办人"
+        >
+          <template slot-scope="scope">
+             <template>
+                <span v-if="!scope.row.editstatus" slot="reference">
+                  {{ scope.row.publisher }}
+                </span>
+                 <el-select
+                 class='staff'
+              v-if="scope.row.editstatus"
+                  v-model="scope.row.publisher"
+              placeholder="请选择经办人"
+              filterable
+              :filter-method="dataFilter"
+              @change="(event)=>{selectstaff(event, scope.row)}"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.staffName"
+                :value="item.staffName"
+              />
+            </el-select>
+              </template>
+            <img
+             v-if="!scope.row.editstatus"
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="editClick1(scope.row)"
+              alt
+            />
+            <i v-if="scope.row.editstatus" @click='checkstaff' class="el-icon-check"></i>
+          </template></el-table-column>
         <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
              <template>
                 <span slot="reference">
-                  <span
-                    v-if="scope.row.taskStatus == '待审核'"
-                    class="executory"
-                  ></span>
                   <span
                     v-if="scope.row.taskStatus == '执行中'"
                     class="inExecution"
@@ -170,62 +199,9 @@
             <span
               class="corles"
               @click="nocomplete(scope.row)"
-              v-hasPermission="
-                `warehouseManagement.warehouse.warehouseInfoTask.View`
-              "
               >查看</span
             >
-            <el-divider
-              direction="vertical"
-              v-if="scope.row.taskStatus == '待审核'"
-            ></el-divider>
-            <span
-              class="corles"
-              v-hasPermission="
-                `warehouseManagement.warehouse.warehouseInfoTask.audit`
-              "
-              v-if="scope.row.taskStatus == '待审核'"
-              @click="audit(scope.row)"
-              >审核</span
-            >
-            <el-divider
-              direction="vertical"
-              class="divider"
-              v-if="
-                scope.row.taskStatus == '待审核' ||
-                scope.row.taskStatus == '执行中' ||
-                scope.row.taskStatus == '已驳回'
-              "
-            ></el-divider>
-            <span
-              class="corles"
-              v-hasPermission="
-                `warehouseManagement.warehouse.warehouseInfoTask.edit`
-              "
-              v-if="
-                scope.row.taskStatus == '待审核' ||
-                scope.row.taskStatus == '执行中' ||
-                scope.row.taskStatus == '已驳回'
-              "
-              @click="delivery(scope.row)"
-              >编辑</span
-            >
-            <el-divider
-            v-hasPermission="
-                `warehouseManagement.warehouse.warehouseInfoTask.edit`
-              "
-              direction="vertical"
-              v-if="scope.row.taskId == null"
-            ></el-divider>
-            <span
-              class="corles"
-              v-hasPermission="
-                `warehouseManagement.warehouse.warehouseInfoTask.delete`
-              "
-              v-if="scope.row.taskId == null"
-              @click="deleteclick(scope.row)"
-              >删除</span
-            >
+            
           </template>
         </el-table-column>
       </el-table>
@@ -241,6 +217,11 @@
   </div>
 </template>
 <script>
+import {
+  getwarehousetask,
+  postcheckorupdate,
+  getstaff
+} from '@/model/warehouse/index'
 import { getoreditoutput, outdelete, movestates } from '@/model/tasksport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -267,9 +248,11 @@ export default {
       dialogApproveFormVisible: false,
       // 船舶类型
       monetaryKey: null,
-      // 表格显示数据
+      id:'',
+      staff:'',
       tableDate: [],
-
+      options:[],
+      staffList:[],
       // 是否显示
       showType: true,
       // 年
@@ -278,16 +261,14 @@ export default {
       currentPage: 1,
       primary: '1',
       pageSize: 10,
-      searchType: 1,
-      searchTypeText: '待审核',
+      searchType: 3,
+      searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
+      publisherList:[],
       taskTypeList: [
-        { value: '待审核', type: 1 },
         { value: '执行中', type: 3 },
-        { value: '已驳回', type: 2 },
-        { value: '已完成', type: 4 },
-        { value: '全部任务', type: '' },
+        { value: '已完成', type: 4 }
       ],
       // 提交类型
       submitType: true,
@@ -310,11 +291,41 @@ export default {
     this.getList()
     this.showType = this.isShow
   },
-  mounted() {
-    this.getList()
-    this.showType = this.isShow
-  },
   methods: {
+     dataFilter(val) {
+      // console.log(val,"名")
+      this.deptBudgetList.staffList = val
+      if (val) {
+        //val存在
+        this.options = this.staffList.filter(item => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.options = this.staffList
+      }
+    },
+    checkstaff(){
+ postcheckorupdate({id:this.id,publisher:this.staff}).toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '经办人修改成功',
+              })
+              this.getList()
+            })
+    },
+    selectstaff(e,item) {
+      this.id=item.id
+      this.staff=e
+      console.log(e,item)
+     
+    },
     //添加
     handleAdd() {
       this.$router.push({ path: 'tranManagementWarehouseInOuttaskAdd' })
@@ -357,15 +368,20 @@ export default {
         })
     },
     getList() {
-      getoreditoutput({
+      console.log(this.$route)
+      getwarehousetask({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
+        stringList:this.$route.query.stringList.toString()
       })
         .toPromise()
         .then((response) => {
+          for (let i = 0; i < response.records.length; i++) {
+            response.records[i].editstatus=false
+          }
           this.gainList = response
           this.currentPage = response.current
           this.pageSize = response.size
@@ -427,7 +443,7 @@ export default {
     //查看//传参
     nocomplete(row) {
       this.$router.push({
-        path: 'inOutWarehousetaskEdit',
+        path: 'warehouseManagementPutOutLook',
         query: {
           relevanceId: row.relevanceId,
           businessKey: row.id,
@@ -500,6 +516,29 @@ export default {
         .catch(() => {
           return false
         })
+    },
+    editClick1(row) {
+      console.log(row)
+     row.editstatus=true
+     var arr=JSON.parse(this.$route.query.warehouseBaseInfoList)
+     for (let i = 0; i < arr.length; i++) {
+       if(arr[i].warehouseName==row.warehouseName){
+console.log(arr[i])
+          getstaff({
+            compId: sessionStorage.getItem('ws-pf_compId'),
+            warehouseId: arr[i].id
+          })
+            .toPromise()
+            .then(response => {
+              this.options = response
+              this.staffList = response
+              //  this.agent = response
+            })
+       }
+       
+     }
+         
+          
     },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
@@ -629,6 +668,11 @@ export default {
   width: 30%;
   margin-right: 10px;
 }
+.el-select.staff{
+  width:85%;
+  display:inline-block;
+  margin-right:2px;
+}
 /deep/.typeselect .el-input__inner {
   color: #8890b1;
 }

src/views/warehouse/warehouseManagementList.vue

@@ -26,9 +26,8 @@
         <ws-button v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfo.delete`
           " @click="handleDelete()">删除</ws-button>
-        <ws-button v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfo.view`
-          " @click="handlTask()">任务</ws-button>
+        <ws-button v-if='list.length>0'
+           @click="handlTask()">任务</ws-button>
       </template>
       <template slot="left">
         <div >
@@ -278,6 +277,7 @@
 <script>
 import {
   getList,
+  getwarehousetask,
   export1,
   editstatus,
   billoperatehis,
@@ -311,7 +311,7 @@ export default {
       monetaryKey: null,
       // 表格显示数据
       tableDate: [],
-
+      list:[],
       // 是否显示
       showType: true,
       // 年
@@ -572,7 +572,13 @@ export default {
     },
     //任务
     handlTask(){
-      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+      var arr=[]
+      console.log(this.list)
+      for (let i = 0; i < this.list.length; i++) {
+        arr.push(this.list[i].warehouseName)
+      }
+      this.$router.push({ path: 'tranManagementWarehouseInOutTask',query:{stringList:arr,warehouseBaseInfoList:JSON.stringify(this.list)} })
+      // this.$router.push({ path: 'tranManagementWarehouseInOutTask',query:{warehouseBaseInfoList:JSON.stringify(this.list)} })
     },
     dateFormat(fmt, date) {
       let ret
@@ -623,7 +629,8 @@ export default {
         compId: sessionStorage.getItem('ws-pf_compId')
       }).toPromise()
         .then((response) => {
-          console.log(response)
+          this.list=response
+          // console.log(response)
         })
     },
     editClick(row) {

src/views/warehouse/warehouseManagementPutOutLook.vue

@@ -10,7 +10,7 @@
           class="bg-bottom"
           type="primary"
           size="small"
-          @click="returnsales()"
+          @click="revert()"
           ><img
             width="6"
             height="10"
@@ -224,7 +224,7 @@
       
     <!-- 关闭 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="close()"
+      <el-button class="bg-bottom" type="primary" size="small" @click="revert()"
         >关闭</el-button
       >
     </div>
@@ -349,9 +349,9 @@ export default {
       this.$router.go(-1)
       
     },
-    returnsales() {
-      this.$router.push({ path: 'warehouseManagementPutOut' })
-    },
+    // returnsales() {
+    //   this.$router.push({ path: 'warehouseManagementPutOut' })
+    // },
 
     // 获取当前年月日
     getdate() {

src/views/warehouse/warehouselocation.vue

@@ -1,4 +1,4 @@
-<!--仓库管理-->
+<!--库点费用-->
 <template>
   <div>
       <el-row>
@@ -24,8 +24,7 @@
     <el-row>
       <el-col class='bg-left' :span="12">
         <div style='align-items:center;' class='flex'>
-          <ws-button class="find" type="primary" @click="addlist()"
-          >添加</ws-button>
+          <ws-button class="find" type="primary" @click="addlist()" v-hasPermission="`warehouseManagement.costControl.delete`">添加</ws-button>
           <div style='align-items:center;' class='flex'>
               <div :class='{"forbidden":forbidden==true}' @click='minus'><i class="el-icon-arrow-left"></i></div>
               <ws-select
@@ -111,7 +110,7 @@
         <el-table-column prop="address" label="操作" width="200">
           <template slot-scope="scope">
             <div class="adjustment" v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfo.view`
+           `warehouseManagement.costControl.audit`
           " @click="editlist(scope.row)">编辑</div>
           </template>
         </el-table-column>

src/views/warehouse/weightedsubsidiary.vue

@@ -1,4 +1,4 @@
-<!--仓库管理-->
+<!--加权明细-->
 <template>
   <div>
       <el-row>

vue.config.js

@@ -141,7 +141,8 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.122:9100/',
+        target: 'http://192.168.1.107:8090/',
+        // target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',