Browse Source

前端孟祥旭

mxx 4 years ago
parent
commit
e06c0f55e5

+ 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>

+ 15 - 23
src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -1,29 +1,21 @@
 <!--出入库任务-->
 <template>
    <div class="container">
-     <!-- <el-buttonclass="butt" type="primary" size="small" @click="add">
-        <img
-          width="22"
-          height="22"
-          @click="add"
-          src="../../../public/img/add.png"
-          alt=""
-        />
-        <div class="spans">添加车厢</div>
-      </el-button> -->
       <div class="nav">
-        <ws-button class="butt" type="primary" @click="handleAdd()">
-         <img
-            width="20"
-            height="20"
-            @click="handleAdd()"
-           src="../../../public/img/add.png"
-           alt=""
-          />
-           <div class="spans">添加</div>
-          </ws-button
-        
-          >
+        <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
+        >
         <ws-input
           v-model="warehouseName"
           placeholder="可按合同编号或任务编号查找"
@@ -317,7 +309,7 @@ export default {
     //编辑
     delivery(item) {
       this.$router.push({
-        path: 'tranManagementWarehouseInOutTaskAdd',
+        path: 'tranManagementWarehouseInOutTaskEdit',
         query: {
           relevanceId: item.relevanceId,
         },

+ 41 - 18
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -31,7 +31,7 @@
       </el-radio-group>
       </div>
       <div class="ding"></div>
-      <div v-if="dataList.taskTypeKey != 2" class="center1">
+       <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
           <img
             style="position: relative; top: 40px; left: 128px;" 
             width="19"
@@ -39,12 +39,11 @@
             src="../../../public/img/cangku.png"
             alt=""
           />
-      <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
         <!--出库=-->
         <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
@@ -224,19 +223,18 @@
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item label="业务描述" span="1">
+          <el-form-item label="业务描述" span="20">
             <el-input
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述,不超过150字"
               maxlength="150"
-              size="small"
-              class="yewu"
+              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"
@@ -336,14 +334,15 @@
             </el-select>
           </el-form-item>
           <!--重量(吨)-->
-          <el-form-item label="重量(吨)" span="1" style=" margin-left: 350px; margin-top: -40px" >
+          <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"
+              class="huom"
+              
             />
           </el-form-item>
           <!-- 品级 -->
@@ -376,7 +375,7 @@
             />
           </el-form-item>
           <!--水分(%)<=-->
-          <el-form-item label="水分(%)<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item label="水分(%)<="  span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
             @input='waterContentchange'
             :disabled='dataList.taskTypeKey == 3'
@@ -388,7 +387,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
             <el-input
             @input='unitPricechange'
             :disabled='dataList.taskTypeKey == 3'
@@ -436,7 +435,7 @@
               v-model="dataList1.businessDescribe"
               placeholder="请输入业务描述,不超过150字"
               maxlength="150"
-              size="small"
+              size="large"
             />
           </el-form-item>
         </el-form>
@@ -444,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
@@ -519,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
@@ -536,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>
           <!-- 品级 -->
@@ -570,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>
           <!--预计出库日期-->
@@ -629,7 +640,7 @@
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述,不超过150字"
               maxlength="150"
-              size="small"
+              size="large"
             />
           </el-form-item>
         </el-form>
@@ -1369,6 +1380,7 @@ export default {
     width: 50.3333%;
     border: none;
     margin: 0;
+    margin-top: 6px;
 }
 .huom{
   width: 100px;
@@ -1392,4 +1404,15 @@ export default {
   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>