Browse Source

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

zhongtianhaoyuan 4 years ago
parent
commit
f46b83473a

+ 2 - 0
src/lang/zh.js

@@ -520,6 +520,7 @@
     tranManagementTransportEdit: '运输任务编辑',
     tranManagementWarehouseInOutTask: '出入库任务',
     tranManagementWarehouseInOutTaskAdd: '出入库任务添加',
+    tranManagementWarehouseInOutTaskEdit:'编辑',
     tranManagementVehicle: '汽运调度',
     tranManagementVehicleDispatching: '汽车调度',
     tranManagementVehicleLook: '查看派车详情',
@@ -4781,6 +4782,7 @@
   },
   // 任务管理
   tranManagement: '任务管理',
+  tranManagementWarehouseInOutTaskEdit:'编辑',
   // 年度培训
   annualTraining: {
     trainingResults: '培训结果',

+ 15 - 0
src/views/taskManagement/component/routers/route.js

@@ -142,6 +142,21 @@ const tranManagementRouter = {
       },
       hidden: true
     },
+    //出入库任务编辑
+    {
+      path: 'tranManagementWarehouseInOutTaskEdit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskEdit'),
+      name: 'tranManagementWarehouseInOutTaskEdit',
+      meta: {
+        title: 'tranManagementWarehouseInOutTaskEdit',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementWarehouseInOutTaskEdit',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
 
   ],
 

+ 221 - 98
src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -1,9 +1,9 @@
-// 创建出入库任务
+// 查看出入库任务
 <template>
   <div class="container">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left title">创建出入库任务</h2>
+        <h2 class="bg-left title">查看出入库任务</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button
@@ -23,41 +23,53 @@
     </el-row>
     <div class="basicInformation">
       <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
-        <el-radio label="1">出库</el-radio>
+        <!-- <el-radio label="1">出库</el-radio>
         <el-radio label="2">入库</el-radio>
         <el-radio label="3">移库</el-radio>
-        <el-radio label="4">退库并出库</el-radio>
+        <el-radio label="4">退库并出库</el-radio> -->
+       
       </el-radio-group>
+       <span class="ziti">任务类型:<h1 class="ziti1">{{dataList.inOutType}}</h1></span>
+      <div class="nav2" >
+       </div> 
       <div v-if="dataList.taskTypeKey != 2" class="center1">
         <!--出库=-->
         <div class="small-title">
+          <img
+            style="position: relative; top: 40px; left: -35px;" 
+            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
+            <!-- <el-select
               disabled
               v-model="dataList.warehouseName"
               placeholder="请选择仓库名"
               class="typeselect"
-            >
+            > -->
               <el-option
                 v-for="item in warehouseNameList"
                 :key="item.constKey"
                 :label="item.warehouseName"
                 :value="item.warehouseName"
               />
-            </el-select>
+              {{dataList.warehouseName}}
+            <!-- </el-select> -->
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="出库类型">
-            <el-select
+            <!-- <el-select
               disabled
               v-model="dataList.inOutType"
               placeholder="请选择出库类型"
               class="typeselect"
-            >
+            > -->
               <el-option
                 v-for="item in storageType"
                 :key="item.constKey"
@@ -71,95 +83,106 @@
                 :label="item.constValue"
                 :value="item.constValue"
               />
-            </el-select>
+              {{dataList.inOutType}}
+            <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
           <el-form-item label="合同编号">
-            <el-select
+            <!-- <el-select
               disabled
               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>
+              {{dataList.contractNo}}
+            <!-- </el-select> -->
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名">
-            <el-select
+          <el-form-item label="货名" class="huom">
+            <!-- <el-select
               disabled
               v-model="dataList.goodsName"
               placeholder="货名"
-              class="typeselect"
-            >
+              class="huom"
+            > -->
               <el-option
                 v-for="item in goodnameList"
                 :key="item.constKey"
                 :label="item.constValue"
                 :value="item.constValue"
               ></el-option>
-            </el-select>
+              {{dataList.goodsName}}
+            <!-- </el-select> -->
           </el-form-item>
           <!--重量(吨)-->
-          <el-form-item label="重量(吨)">
-            <el-input
+          <el-form-item label="重量(吨)" span="1" style=" margin-left: 350px; margin-top: -40px">
+            <!-- <el-input
               disabled
               v-model="dataList.weight"
               placeholder="请输入重量"
               maxlength="120"
-              size="small"
-            />
+               class="huom"
+            /> -->
+            {{dataList.weight}}
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select
+            <!-- <el-select
               v-model="dataList.grade"
               placeholder=""
               class="typeselect"
               disabled
-            >
+            > -->
               <el-option
                 v-for="item in gradeList"
                 :key="item.constKey"
                 :label="item.constValue"
                 :value="item.constValue"
               />
-            </el-select>
+              {{dataList.grade}}
+            <!-- </el-select> -->
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
-            <el-input
+          <el-form-item label="容重(克/升)>="  >
+            <!-- <el-input
               disabled
               v-model="dataList.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList.bulkDensity}}
           </el-form-item>
           <!--水分(%)<=-->
-          <el-form-item label="水分(%)<=">
-            <el-input
+          <el-form-item label="水分(%)<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+            <!-- <el-input
               disabled
               v-model="dataList.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList.waterContent}}
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
-            <el-input
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+            <!-- <el-input
               disabled
               v-model="dataList.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList.unitPrice}}
           </el-form-item>
           <!--预计出库日期-->
           <el-form-item
@@ -168,72 +191,83 @@
             prop="predictDate"
             class="deliverydate"
           >
-            <el-date-picker
+            <!-- <el-date-picker
               disabled
               v-model="dataList.predictDate"
               type="date"
               placeholder="请选择预计出库日期"
               value-format="yyyy-MM-dd"
-            />
+            /> -->
+            {{dataList.predictDate}}
           </el-form-item>
           <!--经办人-->
           <el-form-item label="出库经办人">
-            <el-select
+            <!-- <el-select
               disabled
               v-model="dataList.agent"
               placeholder="请选择经办人"
               filterable
               :filter-method="dataFilter"
-            >
+            > -->
+            {{dataList.agent}}
               <el-option
                 v-for="item in options"
                 :key="item.value"
                 :label="item.staffName"
                 :value="item.staffName"
               />
-            </el-select>
+            <!-- </el-select> -->
           </el-form-item>
           <!--业务描述=-->
           <el-form-item label="业务描述">
-            <el-input
+            <!-- <el-input
               disabled
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述,不超过150字"
               maxlength="150"
               size="small"
-            />
+            /> -->
+            {{dataList.businessDescribe}}
           </el-form-item>
         </el-form>
       </div>
       <div v-if="dataList.taskTypeKey != 1" class="center1">
         <div class="small-title">
+          <img
+            style="position: relative; top: 40px; left: -35px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
           <h3>入库任务({{ inOutTaskNo1 }} )</h3>
         </div>
         <el-form ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
-            <el-select
+            <!-- <el-select
               v-model="dataList1.warehouseName"
               placeholder="请选择仓库名"
               class="typeselect"
               disabled
-            >
+            > -->
+            {{dataList1.warehouseName}}
               <el-option
                 v-for="item in warehouseNameList"
                 :key="item.constKey"
                 :label="item.warehouseName"
                 :value="item.warehouseName"
               />
-            </el-select>
+            <!-- </el-select> -->
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="入库类型">
-            <el-select
+            <!-- <el-select
               v-model="dataList1.inOutType"
               placeholder="请选择入库类型"
               class="typeselect"
               disabled
-            >
+            > -->
               <el-option
                 v-for="item in storageType1"
                 :key="item.constKey"
@@ -247,95 +281,107 @@
                 :label="item.constValue"
                 :value="item.constValue"
               />
-            </el-select>
+              {{dataList1.inOutType}}
+            <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
           <el-form-item label="合同编号">
-            <el-select
+            <!-- <el-select
               disabled
               v-model="dataList1.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
-            >
+            > -->
               <el-option
                 v-for="item in contractNoList"
                 :key="item.constKey"
                 :label="item.contractNo"
                 :value="item.contractNo"
               ></el-option>
-            </el-select>
+              {{dataList1.contractNo}}
+            <!-- </el-select> -->
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名">
-            <el-select
+          <el-form-item label="货名"  class="huom">
+            <!-- <el-select
               disabled
               v-model="dataList1.goodsName"
               placeholder="货名"
-              class="typeselect"
-            >
+               class="huom"
+            > -->
               <el-option
                 v-for="item in goodnameList"
                 :key="item.constKey"
                 :label="item.constValue"
                 :value="item.constValue"
               ></el-option>
-            </el-select>
+              {{dataList1.goodsName}}
+            <!-- </el-select> -->
           </el-form-item>
           <!--重量(吨)-->
-          <el-form-item label="重量(吨)">
-            <el-input
+          <el-form-item label="重量(吨)" span="1" style=" margin-left: 350px; margin-top: -40px" >
+            <!-- <el-input
               disabled
               v-model="dataList1.weight"
               placeholder="请输入重量"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList1.weight}}
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select
+            <!-- <el-select
               disabled
               v-model="dataList1.grade"
               placeholder=""
               class="typeselect"
-            >
+            > -->
               <el-option
                 v-for="item in gradeList"
                 :key="item.constKey"
                 :label="item.constValue"
                 :value="item.constValue"
               />
-            </el-select>
+              {{dataList1.grade}}
+            <!-- </el-select> -->
           </el-form-item>
           <!--容重(克/升)>=-->
           <el-form-item label="容重(克/升)>=">
-            <el-input
+            <!-- <el-input
               disabled
               v-model="dataList1.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList1.bulkDensity}}
           </el-form-item>
           <!--水分(%)<=-->
-          <el-form-item label="水分(%)<=">
-            <el-input
+          <el-form-item label="水分(%)<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+            <!-- <el-input
               disabled
               v-model="dataList1.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList1.waterContent}}
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
-            <el-input
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
+            <!-- <el-input
               disabled
               v-model="dataList1.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
               size="small"
-            />
+              class="huom"
+            /> -->
+            {{dataList1.unitPrice}}
           </el-form-item>
           <!--预计出库日期-->
           <el-form-item
@@ -344,48 +390,51 @@
             prop="predictDate"
             class="deliverydate"
           >
-            <el-date-picker
+            <!-- <el-date-picker
               disabled
               v-model="dataList1.predictDate"
               type="date"
               placeholder="请选择预计入库日期"
               value-format="yyyy-MM-dd"
-            />
+            /> -->
+            {{dataList1.predictDate}}
           </el-form-item>
           <!--经办人-->
           <el-form-item label="入库经办人">
-            <el-select
+            <!-- <el-select
               disabled
               v-model="dataList1.agent"
               placeholder="请选择经办人"
               filterable
               :filter-method="dataFilter"
-            >
+            > -->
               <el-option
                 v-for="item in options"
                 :key="item.value"
                 :label="item.staffName"
                 :value="item.staffName"
               />
-            </el-select>
+              {{dataList1.agent}}
+            <!-- </el-select> -->
           </el-form-item>
           <!--业务描述=-->
           <el-form-item label="业务描述">
-            <el-input
+            <!-- <el-input
               disabled
               v-model="dataList1.businessDescribe"
               placeholder="请输入业务描述,不超过150字"
               maxlength="150"
               size="small"
-            />
+            /> -->
+            {{dataList1.businessDescribe}}
           </el-form-item>
         </el-form>
       </div>
     </div>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
-        >提交</el-button
+      <el-button class="bg-bottom" type="primary" size="small" @click="close()"
+        >关闭</el-button
       >
     </div>
   </div>
@@ -591,26 +640,30 @@ export default {
         }
       })
     },
-    //提交按钮
-    submit() {
-      if (this.dataList.taskTypeKey == 1) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
-        this.requestadd(this.dataList)
-      } else if (this.dataList.taskTypeKey == 2) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo1
-        this.requestadd(this.dataList)
-      } else if (
-        this.dataList.taskTypeKey == 3 ||
-        this.dataList.taskTypeKey == 4
-      ) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
-        this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-        this.requestadd(this.dataList, 'repetition')
-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
-        this.dataList1.relevanceId = this.dataList.relevanceId
-        this.requestadd(this.dataList1, 'repetition')
-      }
+    //关闭
+    close(){
+      this.$router.push({path:'tranManagementWarehouseInOutTask'})
     },
+    //提交按钮
+    // submit() {
+    //   if (this.dataList.taskTypeKey == 1) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo
+    //     this.requestadd(this.dataList)
+    //   } else if (this.dataList.taskTypeKey == 2) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo1
+    //     this.requestadd(this.dataList)
+    //   } else if (
+    //     this.dataList.taskTypeKey == 3 ||
+    //     this.dataList.taskTypeKey == 4
+    //   ) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo
+    //     this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
+    //     this.requestadd(this.dataList, 'repetition')
+    //     this.dataList1.inOutTaskNo = this.inOutTaskNo1
+    //     this.dataList1.relevanceId = this.dataList.relevanceId
+    //     this.requestadd(this.dataList1, 'repetition')
+    //   }
+    // },
     selectwarehouseName() {},
     tarechange(e) {
       if (this.dataList.grossWeight && this.dataList.tare) {
@@ -723,7 +776,7 @@ export default {
     .el-form-item__content {
       padding-left: 0px;
       padding-right: 10px;
-      background: #fff;
+      // background: #fff;
       white-space: nowrap;
       height: 40px;
       display: flex;
@@ -836,4 +889,74 @@ export default {
   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: 80px;
+}
+.ding{
+  height: 23px;
+  background: #E8ECF6;
+  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+}
+.winseaview-main {
+    position: absolute;
+    left: 200px;
+    padding: 0;
+    width: calc(100% - 200px);
+    height: calc(100% - 50px);
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    overflow: hidden;
+    height: 130%;
+}
+.nav2{
+  height: 25px;
+  background: #E8ECF6;
+  margin-top: 15px;
+
+}
+.ziti{
+  width: 70px;
+  height: 20px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890B1;
+  line-height: 20px;
+  margin-left: 80px;
+  margin-top: 5px;
+}
+.ziti1{
+  font-size: 16px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #262626;
+  line-height: 22px;
+  margin-left: 240px;
+  margin-top: -27px;
+
+}
 </style>

+ 106 - 36
src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -1,30 +1,29 @@
 <!--出入库任务-->
 <template>
-  <div>
-    <BaseHeaderLayout :leftSpan="20">
-      <template slot="right">
-        <ws-button class="but" type="primary" @click="handleAdd()"
-          >添加</ws-button
+   <div class="container">
+      <div class="nav">
+        <ws-button class="butt" type="primary" @click="handleAdd()"
+          ><img
+            width="13"
+            height="13"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 2px;
+              left: -4px;
+            "
+            src="../../../public/img/header-add.png"
+            alt=""
+          />添加</ws-button
         >
-      </template>
-      <template slot="left">
-        <ws-button class="but" type="primary" @click="handlestatus(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but" @click="handlestatus(2)">已完成</ws-button>
-        <ws-button class="but" @click="handlestatus('')">全部任务</ws-button>
-      </template>
-      <template slot="left">
         <ws-input
           v-model="warehouseName"
           placeholder="可按合同编号或任务编号查找"
           clearable
           maxlength="500"
           type="input"
-          class="findValue"
-        ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <div class="search">
+          class="Value"
+        ></ws-input> 
           <ws-button class="find" type="primary" @click="lookUp()"
             ><img
               width="16"
@@ -37,11 +36,20 @@
               "
               src="../../../public/img/sousuo.png"
               alt=""
-          /></ws-button>
-        </div>
-      </template>
-    </BaseHeaderLayout>
-    <div>
+          /></ws-button> 
+      </div>
+    <div class="nav2" >
+       </div> 
+    <div class="navv">
+        <ws-button class="but"  @click="handlestatus()">
+          待审核</ws-button>
+          <ws-button class="but"  @click="handlestatus()">
+          已驳回</ws-button>
+        <ws-button class="but"  @click="handlestatus(1)">
+          执行中</ws-button
+        >
+        <ws-button class="but" @click="handlestatus(2)">已完成</ws-button>
+        <ws-button class="but" type="primary" @click="handlestatus('')">全部任务</ws-button>
       <el-table
         class="wenzi"
         :data="gainList.records"
@@ -128,35 +136,36 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <ws-button class="completed" @click="nocomplete(scope.row)">
+            <div class="record" @click="nocomplete(scope.row)">
               查看
-            </ws-button>
-            <ws-button
+            </div>
+            <div
               v-if="scope.row.taskStatus == '待审核'"
-              class="putstorage"
+              class="adjustment"
               @click="delivery(scope.row)"
             >
               审核
-            </ws-button>
-            <ws-button
+            </div>
+            <div
               v-if="
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
               "
-              class="putstorage"
+              class="record"
               @click="delivery(scope.row)"
             >
               编辑
-            </ws-button>
-            <ws-button
+            </div>
+            <div
               v-if="
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
               "
+              class="adjustment"
               @click="deleteclick(scope.row)"
             >
               删除
-            </ws-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -300,7 +309,7 @@ export default {
     //编辑
     delivery(item) {
       this.$router.push({
-        path: 'tranManagementWarehouseInOutTaskAdd',
+        path: 'tranManagementWarehouseInOutTaskEdit',
         query: {
           relevanceId: item.relevanceId,
         },
@@ -532,13 +541,14 @@ export default {
   background: #e9ecf7;
 }
 .el-row {
-  height: 150px;
+  height: 80px;
 }
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
 .but {
-  margin-top: 150px;
+  margin-left: 55px;
+  margin-top: 30px;
 }
 .findValue {
   width: 0%;
@@ -548,4 +558,64 @@ export default {
 .search {
   margin-left: -250px;
 }
+.butt{
+ margin-left: 60px;
+ margin-top: 20px;
+}
+.Value{
+  width: 300px;
+}
+.el-pagination {
+  margin-bottom: 20px;
+  margin-left: 40%;
+}
+.winseaview-main{
+ background: #E8ECF6;
+box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+}
+.nav{
+  background: white
+  
+}
+.navv{
+  background: #FFFFFF;
+  border-radius: 4px;
+  margin-top: -8px;
+}
+// .nav2{
+//   width: auto;
+//   height: 5px;
+//   background-color: #e8eaf1;
+// }
+.nav2{
+  height: 25px;
+  background: #E8ECF6;
+  margin-top: 15px;
+}
+.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;
+}
 </style>

+ 113 - 29
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -22,18 +22,28 @@
       </el-col>
     </el-row>
     <div class="basicInformation">
-      <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
-        <el-radio label="1">出库</el-radio>
-        <el-radio label="2">入库</el-radio>
-        <el-radio label="3">移库</el-radio>
-        <el-radio label="4">退库并出库</el-radio>
+      <div class="annu">
+        <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
+        <el-radio label="1" class="a">出库</el-radio>
+        <el-radio label="2" class="a">入库</el-radio>
+        <el-radio label="3" class="a">移库</el-radio>
+        <el-radio label="4" class="a">退库并出库</el-radio>
       </el-radio-group>
-      <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
+      </div>
+      <div class="ding"></div>
+       <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
+          <img
+            style="position: relative; top: 40px; left: 128px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
         <!--出库=-->
         <div class="small-title">
           <h3>出库任务({{ inOutTaskNo }})</h3>
         </div>
-        <el-form ref="dataList" :model="dataList" label-width="140px">
+        <el-form ref="dataList" :model="dataList" label-width="140px" input-width="300px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
             <el-select
@@ -106,12 +116,12 @@
             </el-select>
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名">
+          <el-form-item label="货名" class="huom">
             <el-select
             :disabled='dataList.taskTypeKey != 3'
               v-model="dataList.goodsName"
               placeholder="货名"
-              class="typeselect"
+              class="huom"
               @change="selectgoodsName"
             >
               <el-option
@@ -123,12 +133,13 @@
             </el-select>
           </el-form-item>
           <!--重量(吨)-->
-          <el-form-item label="重量(吨)">
+          <el-form-item label="重量(吨)" span="1" style=" margin-left: 350px; margin-top: -40px" >
             <el-input
               v-model="dataList.weight"
               placeholder="请输入重量"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!-- 品级 -->
@@ -154,27 +165,30 @@
               v-model="dataList.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
-              size="small"
+              size="small" 
+              class="huom"
             />
           </el-form-item>
           <!--水分(%)<=-->
-          <el-form-item label="水分(%)<=">
+          <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-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <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-form-item>
           <!--预计出库日期-->
@@ -209,17 +223,25 @@
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item label="业务描述">
+          <el-form-item label="业务描述" span="20">
             <el-input
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述,不超过150字"
               maxlength="150"
-              size="small"
+              size="large"
+              
             />
           </el-form-item>
         </el-form>
       </div>
-      <div v-if="dataList.taskTypeKey != 1" class="center1">
+      <div v-show="dataList.taskTypeKey != 1" class="center1">
+        <img
+            style="position: relative; top: 40px; left: 128px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
         <div class="small-title">
           <h3>入库任务({{ inOutTaskNo1 }} )</h3>
         </div>
@@ -295,12 +317,12 @@
             </el-select>
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名">
+          <el-form-item label="货名" class="huom">
             <el-select
             :disabled='dataList.taskTypeKey != 3'
               v-model="dataList1.goodsName"
               placeholder="货名"
-              class="typeselect"
+              class="huom"
               @change="selectgoodsName1"
             >
               <el-option
@@ -312,13 +334,15 @@
             </el-select>
           </el-form-item>
           <!--重量(吨)-->
-          <el-form-item label="重量(吨)">
+          <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-form-item>
           <!-- 品级 -->
@@ -347,10 +371,11 @@
               placeholder="请输入容重"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--水分(%)<=-->
-          <el-form-item label="水分(%)<=">
+          <el-form-item label="水分(%)<="  span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
             @input='waterContentchange'
             :disabled='dataList.taskTypeKey == 3'
@@ -358,10 +383,11 @@
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
             <el-input
             @input='unitPricechange'
             :disabled='dataList.taskTypeKey == 3'
@@ -369,6 +395,7 @@
               placeholder="请输入单价"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--预计出库日期-->
@@ -408,7 +435,7 @@
               v-model="dataList1.businessDescribe"
               placeholder="请输入业务描述,不超过150字"
               maxlength="150"
-              size="small"
+              size="large"
             />
           </el-form-item>
         </el-form>
@@ -416,9 +443,17 @@
       <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=""
+          />
           <h3>出库任务({{ inOutTaskNo }})</h3>
         </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
+          
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
             <el-select
@@ -491,12 +526,12 @@
             </el-select>
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名">
+          <el-form-item label="货名" class="huom" >
             <el-select
             :disabled='dataList.taskTypeKey != 3'
               v-model="dataList.goodsName"
               placeholder="货名"
-              class="typeselect"
+              class="huom"
               @change="selectgoodsName"
             >
               <el-option
@@ -508,13 +543,14 @@
             </el-select>
           </el-form-item>
           <!--重量(吨)-->
-          <el-form-item label="重量(吨)">
+          <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-form-item>
           <!-- 品级 -->
@@ -542,26 +578,29 @@
               placeholder="请输入容重"
               maxlength="120"
               size="small"
+              class="huom"
             />
           </el-form-item>
           <!--水分(%)<=-->
-          <el-form-item label="水分(%)<=">
+          <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-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <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-form-item>
           <!--预计出库日期-->
@@ -601,7 +640,7 @@
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述,不超过150字"
               maxlength="150"
-              size="small"
+              size="large"
             />
           </el-form-item>
         </el-form>
@@ -614,6 +653,7 @@
       >
     </div>
   </div>
+  </div>
 </template>
 <script>
 import {
@@ -1218,7 +1258,7 @@ export default {
     .el-form-item__content {
       padding-left: 0px;
       padding-right: 10px;
-      background: #fff;
+      // background: #fff;
       white-space: nowrap;
       height: 40px;
       display: flex;
@@ -1331,4 +1371,48 @@ export default {
   position: relative;
   width: 100%;
 }
+.annu{
+  height: 81px;
+  background: #FFFFFF;
+  border-radius: 4px;
+}
+.basicInformation .el-form-item {
+    width: 50.3333%;
+    border: none;
+    margin: 0;
+    margin-top: 6px;
+}
+.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: 80px;
+}
+.ding{
+  height: 23px;
+  background: #E8ECF6;
+  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+}
+/deep/.winseaview-main {
+    position: absolute;
+    left: 200px;
+    padding: 0;
+    width: calc(100% - 200px);
+    // height: calc(100% - 50px);
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    overflow: hidden;
+    // height: 130%;
+}
 </style>

+ 1440 - 0
src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -0,0 +1,1440 @@
+// 编辑出入库任务
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left title">编辑出入库任务</h2>
+      </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=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+    <div class="basicInformation">
+      <div class="annu">
+        <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
+        <!-- <el-radio label="1" class="a">出库</el-radio>
+        <el-radio label="2" class="a">入库</el-radio>
+        <el-radio label="3" class="a">移库</el-radio>
+        <el-radio label="4" class="a">退库并出库</el-radio> -->
+      </el-radio-group>
+        <span class="ziti">任务类型:<b><h1 class="ziti1">{{dataList.inOutType}}</h1></b></span>
+      </div>
+      <div class="ding"></div>
+       <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
+          <img
+            style="position: relative; top: 40px; left: 128px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
+        <!--出库=-->
+        <div class="small-title">
+          <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.warehouseName"
+              />
+            </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="
+                  (dataList.taskTypeKey == 1 &&
+                    item.constValue != '移库出库') ||
+                  (dataList.taskTypeKey == 3 &&
+                    item.constValue == '移库出库') ||
+                  (dataList.taskTypeKey == 4 && 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>
+          </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>
+          </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>
+          </el-form-item>
+          <!--重量(吨)-->
+          <el-form-item label="重量(吨)" span="1" style=" margin-left: 350px; margin-top: -40px" >
+            <el-input
+              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>
+          </el-form-item>
+          <!--容重(克/升)>=-->
+          <el-form-item label="容重(克/升)>=">
+            <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-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-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-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>
+          </el-form-item>
+          <!--业务描述=-->
+          <el-form-item label="业务描述" span="1">
+            <el-input
+              v-model="dataList.businessDescribe"
+              placeholder="请输入业务描述,不超过150字"
+              maxlength="150"
+              size="large"
+              class="yewu"
+              
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+      <div v-show="dataList.taskTypeKey != 1" class="center1">
+        <img
+            style="position: relative; top: 40px; left: 128px;" 
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
+        <div class="small-title">
+          <h3>入库任务({{ inOutTaskNo1 }} )</h3>
+        </div>
+        <el-form ref="form" :model="form" label-width="140px">
+          <!-- 仓库名 -->
+          <el-form-item label="仓库名">
+            <el-select
+              v-model="dataList1.warehouseName"
+              placeholder="请选择仓库名"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in warehouseNameList"
+                :key="item.constKey"
+                :label="item.warehouseName"
+                :value="item.warehouseName"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 出库类型 -->
+          <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="
+                  (dataList1.taskTypeKey == 2 &&
+                    item.constValue != '移库入库') ||
+                  (dataList1.taskTypeKey == 3 &&
+                    item.constValue == '移库入库') ||
+                  (dataList1.taskTypeKey == 4 && 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 contractNoList"
+                :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-select
+            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-select>
+          </el-form-item>
+          <!-- 货名 -->
+          <el-form-item label="货名" class="huom">
+            <el-select
+            :disabled='dataList.taskTypeKey != 3'
+              v-model="dataList1.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-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>
+          </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-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-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-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-form-item>
+          <!--经办人-->
+          <el-form-item label="入库经办人">
+            <el-select
+              v-model="dataList1.agent"
+              placeholder="请选择经办人"
+              filterable
+              :filter-method="dataFilter"
+              @change="selectstaff1"
+            >
+              <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="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=""
+          />
+          <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.warehouseName"
+              />
+            </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="
+                  (dataList.taskTypeKey == 1 &&
+                    item.constValue != '移库出库') ||
+                  (dataList.taskTypeKey == 3 &&
+                    item.constValue == '移库出库') ||
+                  (dataList.taskTypeKey == 4 && 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>
+          </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>
+          </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>
+          </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-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>
+          </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-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-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-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-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>
+          </el-form-item>
+          <!--业务描述=-->
+          <el-form-item label="业务描述">
+            <el-input
+              v-model="dataList.businessDescribe"
+              placeholder="请输入业务描述,不超过150字"
+              maxlength="150"
+              size="large"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <!-- 提交 -->
+    <div style="text-align: right; padding: 10px" class="center">
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+        >提交</el-button
+      >
+    </div>
+  </div>
+  </div>
+</template>
+<script>
+import {
+  getwarehousename,
+  xialaNo,
+  addoreditoutput,
+  outexamine,
+  getGoodsName
+} from '@/model/tasksport/index'
+import { packList } from '@/model/contarct/index'
+import { pullDown, getstaff } from '@/model/warehouse/index'
+import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import { mapActions, mapGetters, mapState } from 'vuex'
+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
+    },
+  },
+  computed: {
+    ...mapGetters(['deptBudgetList']),
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      disabled:false,
+      // 年
+      year: '',
+      contractNoList: [],
+      deptBudgetTotal: 0,
+      readonly: true,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: 1,
+      searchKeyWord: '',
+      radio: '1',
+      contractType: 2,
+      startDate: null,
+      endDate: null,
+      goodnameList: [],
+      checked: true,
+      form: {},
+
+      staffList: [],
+      options: [],
+      storageType: [],
+      storageType1: [],
+      outContractNo: [],
+      // 提交类型
+      submitType: true,
+      status: [],
+      warehouseNameList: [],
+      warehouseNameList1: [],
+      appendixIdsAdd: '',
+      uploadSuccess: {},
+      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()
+        },
+      },
+      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)
+      if (mouth < 10) {
+        mouth = '0' + mouth
+      }
+      if (datetime < 10) {
+        datetime = '0' + datetime
+      }
+      return year + mouth + datetime
+    },
+    // 随机验证码
+    verifyinit() {
+      var arr = []
+      for (var i = 48; i < 123; i++) {
+        if (i > 57 && i < 65) continue
+        if (i > 90 && i < 97) continue
+        arr.push(String.fromCharCode(i))
+      }
+      arr.sort(function () {
+        return Math.random() - 0.5
+      })
+      arr.length = 4
+
+      return arr.join('')
+    },
+    selectTaskNo(e){
+      if(this.dataList.taskTypeKey==3){
+          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
+          }
+        })
+      } else {
+        //val为空时,还原数组
+        this.options = this.staffList
+      }
+    },
+    weightchange(e){
+      if(this.dataList.taskTypeKey==4){
+        this.$set(this.dataList,'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)
+            })
+          } 
+        }
+      }
+    },
+    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)
+            })
+          } 
+        }
+      }
+    },
+    selectstaff(e) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.dataList.agentKey = this.staffList[i].staffId
+        }
+      }
+    },
+    selectstaff1(e) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.dataList1.agentKey = this.staffList[i].staffId
+        }
+      }
+    },
+    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) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+            })
+    },
+    //提交按钮
+    submit() {
+      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)
+
+        this.requestadd(this.dataList, 'repetition')
+        this.dataList1.inOutTaskNo = this.inOutTaskNo1
+        this.dataList1.relevanceId = this.dataList.relevanceId
+        this.requestadd(this.dataList1, 'repetition')
+      }
+    },
+    selectwarehouseName() {},
+    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
+        }
+      }
+    },
+    selectgoodsName1(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.dataList1.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)
+          }
+        }
+      }
+    },
+    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)
+          }
+        }
+      }
+    },
+    selectstorageType(e) {
+      for (var i = 0; i < this.storageType.length; i++) {
+        if (this.storageType[i].constValue == e) {
+          this.dataList.inOutTypeKey = this.storageType[i].constKey
+        }
+      }
+    },
+    selectstorageType1(e) {
+      for (var i = 0; i < this.storageType1.length; i++) {
+        if (this.storageType1[i].constValue == e) {
+          this.dataList1.inOutTypeKey = this.storageType1[i].constKey
+        }
+      }
+    },
+    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.verifyinit()
+      } else if (this.dataList.taskTypeKey == 2) {
+        this.inOutTaskNo1 = 'RK' + this.getdate() + this.verifyinit()
+      } else if (this.dataList.taskTypeKey == 3) {
+        var random=this.getdate() + this.verifyinit()
+        this.inOutTaskNo = 'YKC' + random
+        this.inOutTaskNo1 = 'YKR' + random
+      } else if (this.dataList.taskTypeKey == 4) {
+        var random=this.getdate() + this.verifyinit()
+        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'
+      }
+      if(this.dataList1.taskTypeKey==2){
+        this.dataList1.inOutType='采购入库'
+        this.dataList1.inOutTypeKey='1'
+      }
+      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.dataList.inOutTypeKey='1'
+      }
+    },
+    GetRandomNum(Min, Max) {
+      var Range = Max - Min
+      var Rand = Math.random()
+      return Min + Math.round(Rand * Range)
+    },
+    getList() {
+      if (this.$route.query.relevanceId) {
+        outexamine({ relevanceId: this.$route.query.relevanceId })
+          .toPromise()
+          .then((response) => {
+            if (response.length > 1) {
+              this.dataList = response[0]
+              this.dataList1 = response[1]
+            } else {
+              this.dataList = response[0]
+            }
+          })
+      } else {
+        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,
+      })
+        .toPromise()
+        .then((response) => {
+          this.contractNoList = 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) => {
+          this.warehouseNameList1 = response
+        })
+      //经办人
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+        .toPromise()
+        .then((response) => {
+          this.options = response
+          this.staffList = response
+          //  this.agent = response
+        })
+    },
+    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
+        })
+    },
+
+    async exportlist() {
+      const { data } = await export1(
+        {
+          compId: sessionStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          startDate: this.startDate,
+          endDate: this.endDate,
+        },
+        {},
+        { responseType: 'blob' }
+      ).toPromise()
+      downloadFile({
+        res: data,
+        fileName: `${
+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
+        }_采购合同`,
+        type: 'xls',
+      })
+    },
+
+    // deletecontract(){},
+    //删除
+    approve() {},
+    listQuery() {},
+    total() {},
+    clearfiltQuery() {},
+    selectCrtDuty() {},
+  },
+}
+</script>
+<style lang="scss" scoped>
+/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 {
+  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: 150px;
+}
+.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: 80px;
+}
+.ding{
+  height: 23px;
+  background: #E8ECF6;
+  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+}
+.winseaview-main {
+    position: absolute;
+    left: 200px;
+    padding: 0;
+    width: calc(100% - 200px);
+    height: calc(100% + 60px);
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    overflow: hidden;
+    
+}
+.ziti{
+  width: 70px;
+  height: 20px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890B1;
+  line-height: 20px;
+  margin-left: 80px;
+  margin-top: 5px;
+}
+.ziti1{
+  font-size: 16px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #262626;
+  line-height: 22px;
+  margin-left: 240px;
+  margin-top: -27px;
+
+}
+</style>

+ 1 - 1
src/views/warehouse/warehouseManagementList.vue

@@ -17,7 +17,7 @@
         <ws-button @click="handleLook()">查看</ws-button>
         <ws-button @click="handleEdit()">编辑</ws-button>
         <ws-button @click="handleDelete()">删除</ws-button>
-        <ws-button @click="handlTask()">任务{{}}</ws-button>
+        <ws-button @click="handlTask()">任务</ws-button>
       </template>
       <template slot="left">
         <div style="margin-top: 2px">

+ 128 - 54
src/views/warehouse/warehouseManagementPutOut.vue

@@ -1,11 +1,11 @@
 //出入库任务
 <template>
  <div class="container">
-      <el-row>
-      <el-col :span="20">
+    <el-row>
+      <el-col :span="12">
         <h2 class="bg-left title">出入库任务</h2>
       </el-col>
-      <el-col :span="4" class="bg-right">
+      <el-col :span="12" class="bg-right">
         <el-button
           class="bg-bottom"
           type="primary"
@@ -20,26 +20,18 @@
           />返回</el-button
         >
       </el-col>
-    </el-row>
-    <BaseHeaderLayout :leftSpan="12">
-      <template slot="left">
-        <ws-button class="but" type="primary" @click="statusquery(1)">
-          执行中</ws-button
-        >
-        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
-      </template>
-      <!-- 接单开始 -->
-      <template slot="right">
-        <ws-input
+    </el-row>  
+    <!-- <div> -->
+     <div>
+       <ws-input
           v-model="searchKeyWord"
-          placeholder="可按发货人、收货人、任务编号查找"
+          placeholder="可按照合同编号和任务编号进行查找"
           clearable
           maxlength="500"
           type="input"
           class="findValue"
         ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <ws-button class="find" type="primary" @click="find()"
+        <ws-button class="but" type="primary" @click="find()"
           ><img
             width="16"
             height="16"
@@ -52,10 +44,11 @@
             src="../../../public/img/sousuo.png"
             alt=""
         /></ws-button>
-       
-      </template>
-    </BaseHeaderLayout>
-    <div>
+     </div>
+        <ws-button  type="primary" @click="statusquery(1)" >
+          执行中</ws-button
+        >
+        <ws-button  @click="statusquery(2)">已完成</ws-button>
       <el-table
         class="wenzi"
         :data="warehouseList.records"
@@ -90,7 +83,7 @@
         <el-table-column class="table_td" prop="agent" label="经办人" >
           
         </el-table-column>
-      <el-table-column prop="status" label="状态">
+      <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -102,15 +95,15 @@
               <template>
                 <span slot="reference">
                   <span
-                    v-if="scope.row.status == '待执行'"
+                    v-if="scope.row.taskStatus == '待执行'"
                     class="executory"
                   ></span>
                   <span
-                    v-if="scope.row.status == '执行中'"
+                    v-if="scope.row.taskStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span
-                  >{{ scope.row.status }}
+                  <span v-if="scope.row.taskStatus == '已完成'" class="done"></span
+                  >{{ scope.row.taskStatus }}
                 </span>
               </template>
               <div>
@@ -158,13 +151,13 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize"
+        :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal"
       >
       </el-pagination>
     </div>
-  </div>
+  <!-- </div> -->
 </template>
 <script>
 import {
@@ -219,7 +212,8 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
-      warehouseName: '',
+      contractNo: '',
+      inOutTaskNo:'',
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       warehouseList: [],
@@ -234,9 +228,6 @@ export default {
     }
   },
   activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
     this.getList()
     this.showType = this.isShow
   },
@@ -250,6 +241,8 @@ export default {
         contractType:this.contractType,
         tranTypeKey: this.tranTypeKey, 
         searchType:this.searchType,
+        contractNo:this.contractNo,
+        inOutTaskNo:this.inOutTaskNo,
 
       })
       .toPromise()
@@ -354,7 +347,7 @@ export default {
     },
     editClick(row) {
       var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
+      if (row.status == '待审核' || row.status == '已完成') {
         status = '执行中'
       } else if (row.status == '执行中') {
         status = '已完成'
@@ -390,26 +383,26 @@ export default {
         }
       }
     },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
+    // 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
@@ -421,6 +414,7 @@ export default {
           this.historyList = response
         })
     },
+    //查找
     find() {
       this.currentPage = 1
       this.getList()
@@ -492,6 +486,7 @@ export default {
 /deep/.findValue .el-input__inner {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
+  width: 385px;
 }
 .completed.el-button--default {
   border-color: #5878e8;
@@ -530,15 +525,12 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-.el-row{
-    height: 150px;
-}
+// .el-row{
+//     height: 150px;
+// }
 .base_header_layout .grid-content{
     margin-top: 80px;
 }
-.but{
-    margin-top: 150px;
-}
 .el-input--small .el-input__inner{
     margin-left: 20px;
 }
@@ -576,5 +568,87 @@ export default {
 }
 .container {
   overflow: scroll;
+  height: 93vh;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.bg-left {
+  padding-left: 30px;
 }
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+    // margin-left: 85%;
+    margin-top: 20px;
+}
+//导航条样式
+.el-col-12 {
+    width: 50%;
+    height: 60px;
+    background: #F6F7FC;
+    border-radius: 4px 4px 1px 1px;
+}
+.el-input--small .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+    width: 385px;
+    margin-top: 10px;
+}
+.bg-bottom{
+ margin-left: 85%;
+}
+.but {
+    margin-left: 30%;
+    /* margin-top: -32px; */
+    overflow: auto;
+    /* float: left; */
+    /* margin-left: 1px; */
+    margin-left: -10px;
+}
+.el-input--small {
+    font-size: 13px;
+    width: 390px;
+}
+
 </style>

+ 54 - 58
src/views/warehouse/warehouseManagementPutOutLook.vue

@@ -27,9 +27,9 @@
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 任务编号 -->
           <el-form-item label="任务编号">
-            <el-select
+            <el-input
               disabled
-              v-model="dataList.warehouseName"
+              v-model="dataList.inOutTaskNo"
               class="typeselect"
             >
               <el-option
@@ -38,15 +38,13 @@
                 :label="item.warehouseName"
                 :value="item.warehouseName"
               />
-            </el-select>
+            </el-input>
           </el-form-item>
-          
           <!-- 合同编号 -->
           <el-form-item label="合同编号">
-            <el-select
+            <el-input
               disabled
               v-model="dataList.contractNo"
-              placeholder="请输入合同编号"
               class="typeselect"
             >
               <el-option
@@ -55,14 +53,13 @@
                 :label="item.contractNo"
                 :value="item.contractNo"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 库房名 -->
           <el-form-item label="库房名">
-            <el-select
+            <el-input
               disabled
-              v-model="dataList.goodsName"
-              placeholder="货名"
+              v-model="dataList.warehouseName"
               class="typeselect"
             >
               <el-option
@@ -71,14 +68,13 @@
                 :label="item.constValue"
                 :value="item.constValue"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 类型-->
           <el-form-item label="类型">
-            <el-select
+            <el-input
               disabled
-              v-model="dataList.goodsName"
-              placeholder="货名"
+              v-model="dataList. inOutType"
               class="typeselect"
             >
               <el-option
@@ -87,11 +83,11 @@
                 :label="item.constValue"
                 :value="item.constValue"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名">
-            <el-select
+            <el-input
               disabled
               v-model="dataList.goodsName"
               placeholder="货名"
@@ -103,14 +99,13 @@
                 :label="item.constValue"
                 :value="item.constValue"
               ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
           <!--重量(吨)-->
           <el-form-item label="重量(吨)">
             <el-input
               disabled
               v-model="dataList.weight"
-              placeholder="请输入重量"
               maxlength="120"
               size="small"
             />
@@ -126,16 +121,14 @@
               disabled
               v-model="dataList.predictDate"
               type="date"
-              placeholder="请选择预计出库日期"
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
           <!--经办人-->
           <el-form-item label="经办人">
-            <el-select
+            <el-input
               disabled
               v-model="dataList.agent"
-              placeholder="请选择经办人"
               filterable
               :filter-method="dataFilter"
             >
@@ -145,13 +138,12 @@
                 :label="item.staffName"
                 :value="item.staffName"
               />
-            </el-select>
+            </el-input>
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
-            <el-select
+            <el-input
               v-model="dataList.grade"
-              placeholder=""
               class="typeselect"
               disabled
             >
@@ -161,14 +153,13 @@
                 :label="item.constValue"
                 :value="item.constValue"
               />
-            </el-select>
+            </el-input>
           </el-form-item>
           <!--容重(克/升)>=-->
           <el-form-item label="容重(克/升)>=">
             <el-input
               disabled
               v-model="dataList.bulkDensity"
-              placeholder="请输入容重"
               maxlength="120"
               size="small"
             />
@@ -178,7 +169,6 @@
             <el-input
               disabled
               v-model="dataList.waterContent"
-              placeholder="请输入水分占比"
               maxlength="120"
               size="small"
             />
@@ -188,7 +178,6 @@
             <el-input
               disabled
               v-model="dataList.unitPrice"
-              placeholder="请输入单价"
               maxlength="120"
               size="small"
             />
@@ -197,7 +186,7 @@
           <el-form-item label="发布人">
             <el-input
               disabled
-              v-model="dataList.unitPrice"
+              v-model="dataList.publisher"
               maxlength="120"
               size="small"
             />
@@ -215,7 +204,7 @@
           <el-form-item label="仓位">
             <el-input
               disabled
-              v-model="dataList.unitPrice"
+              v-model="dataList.positionId"
               maxlength="120"
               size="small"
             />
@@ -233,19 +222,19 @@
         </el-form>
       </div>
       
-    <!-- 提交 -->
+    <!-- 关闭 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
-        >提交</el-button
+      <el-button class="bg-bottom" type="primary" size="small" @click="close()"
+        >关闭</el-button
       >
     </div>
   </div>
 </template>
 <script>
 import {
-  getwarehousename,
-  xialaNo,
-  addoreditoutput,
+  // getwarehousename,
+  // xialaNo,
+  // addoreditoutput,
   outexamine,
 } from '@/model/tasksport/index'
 import { packList } from '@/model/contarct/index'
@@ -358,10 +347,12 @@ export default {
     //返回按钮
     revert() {
       this.$router.go(-1)
+      
     },
     returnsales() {
-      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+      this.$router.push({ path: 'warehouseManagementPutOut' })
     },
+
     // 获取当前年月日
     getdate() {
       var date = new Date()
@@ -442,26 +433,32 @@ export default {
         }
       })
     },
-    //提交按钮
-    submit() {
-      if (this.dataList.taskTypeKey == 1) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
-        this.requestadd(this.dataList)
-      } else if (this.dataList.taskTypeKey == 2) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo1
-        this.requestadd(this.dataList)
-      } else if (
-        this.dataList.taskTypeKey == 3 ||
-        this.dataList.taskTypeKey == 4
-      ) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
-        this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-        this.requestadd(this.dataList, 'repetition')
-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
-        this.dataList1.relevanceId = this.dataList.relevanceId
-        this.requestadd(this.dataList1, 'repetition')
-      }
+    // 关闭
+    close(){
+        this.$router.push({ 
+        path: 'warehouseManagementPutOut',
+        })
     },
+    //提交按钮
+    // submit() {
+    //   if (this.dataList.taskTypeKey == 1) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo
+    //     this.requestadd(this.dataList)
+    //   } else if (this.dataList.taskTypeKey == 2) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo1
+    //     this.requestadd(this.dataList)
+    //   } else if (
+    //     this.dataList.taskTypeKey == 3 ||
+    //     this.dataList.taskTypeKey == 4
+    //   ) {
+    //     this.dataList.inOutTaskNo = this.inOutTaskNo
+    //     this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
+    //     this.requestadd(this.dataList, 'repetition')
+    //     this.dataList1.inOutTaskNo = this.inOutTaskNo1
+    //     this.dataList1.relevanceId = this.dataList.relevanceId
+    //     this.requestadd(this.dataList1, 'repetition')
+    //   }
+    // },
     selectwarehouseName() {},
     tarechange(e) {
       if (this.dataList.grossWeight && this.dataList.tare) {
@@ -531,7 +528,6 @@ export default {
       return Min + Math.round(Rand * Range)
     },
     getList() {
-      console.log(11111)
       outexamine({ relevanceId: this.$route.query.relevanceId })
         .toPromise()
         .then((response) => {
@@ -542,8 +538,8 @@ export default {
             this.dataList = response[0]
           }
         })
-    },
 
+    },
     // deletecontract(){},
     //删除
     approve() {},