修改禅道问题

src/views/fleet/plans/AddOrUpdate.vue

@@ -1588,7 +1588,7 @@ export default {
       let arr = this.schedulingList;
       let arr2 = arr.filter((e) => e.cntrId == row.cntrId && e.cntrId != null);
       if (arr2.length != 0) {
-        this.msgSuccess("调度安排已插入此箱型数据，不能删除");
+        this.$message.error("调度安排已插入此箱型数据，不能删除");
       } else {
         this.cntrIdList
           .filter((item) => item.dictValue == row.cntrId)
@@ -1652,7 +1652,7 @@ export default {
             formData.append("plans", JSON.stringify(this.schedulingList));
             if (this.form.billStatus != 5) {
               addFtmsorderbills(formData).then((response) => {
-                this.msgSuccess("新增成功");
+                this.msgSuccess("提交成功");
                 this.$parent.getList();
                 this.showDialog = false;
               });
@@ -1665,7 +1665,7 @@ export default {
             }
           } else {
             // this.msgSuccess("调度安排中有未提交的数据");
-            this.msgSuccess("请先提交调度安排的派车信息");
+            this.$message.error("请先提交调度安排的派车信息");
           }
         }
       });
@@ -1691,7 +1691,7 @@ export default {
           this.$parent.getList();
           this.$parent.getSave(response);
         } else {
-          this.msgSuccess("保存失败");
+          this.$message.error("保存失败");
         }
       });
     },
@@ -1708,7 +1708,7 @@ export default {
           }
         });
       } else {
-        this.msgSuccess("单据未提交，不能进行撤销");
+        this.$message.error("单据未提交，不能进行撤销");
       }
     },
     //修改
@@ -1730,7 +1730,7 @@ export default {
                 this.msgSuccess("允许修改");
                 this.$set(this.form, "billStatus", 5);
               } else {
-                this.msgSuccess("不允许修改");
+                this.$message.error("不允许修改");
               }
             });
           })
@@ -1749,7 +1749,7 @@ export default {
         this.planList.length == 0 ||
         Object.keys(this.planList[0]).length == 0
       ) {
-        this.msgSuccess("至少添加一条计划货量");
+        this.$message.error("至少添加一条计划货量");
       } else if (pidList.length != this.planList.length) {
         this.$confirm("计划货量存在未保存数据，是否保存?", "提示", {
           confirmButtonText: "确定",
@@ -1798,7 +1798,7 @@ export default {
           }
         });
       } else {
-        this.msgSuccess("请勿重复提交");
+        this.$message.error("请勿重复提交");
       }
     },
     delplansRow(index, rows, row) {
@@ -1823,7 +1823,7 @@ export default {
           }
         });
       } else {
-        this.msgSuccess("此条数据没有提交，不能申请撤回");
+        this.$message.error("此条数据没有提交，不能申请撤回");
       }
     },
     changeplansRow(row) {
@@ -1835,7 +1835,7 @@ export default {
           }
         });
       } else {
-        this.msgSuccess("请勿重复变更");
+        this.$message.error("请勿重复变更");
       }
     },
     mbinput(val) {

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -1563,7 +1563,7 @@ export default {
       let arr = this.schedulingList;
       let arr2 = arr.filter((e) => e.cntrId == row.cntrId && e.cntrId != null);
       if (arr2.length != 0) {
-        this.msgSuccess("调度安排已插入此箱型数据，不能删除");
+        this.$message.error("调度安排已插入此箱型数据，不能删除");
       } else {
         this.cntrIdList
           .filter((item) => item.dictValue == row.cntrId)
@@ -1615,7 +1615,7 @@ export default {
             });
           } else {
             //this.msgSuccess("调度安排中有未提交的数据");
-            this.msgSuccess("请先提交调度安排的派车信息");
+            this.$message.error("请先提交调度安排的派车信息");
           }
         }
       });
@@ -1677,7 +1677,7 @@ export default {
                 this.msgSuccess("允许修改");
                 this.$set(this.form, "billStatus", 5);
               } else {
-                this.msgSuccess("不允许修改");
+                this.$message.error("不允许修改");
               }
             });
           })
@@ -1697,7 +1697,7 @@ export default {
         this.planList.length == 0 ||
         Object.keys(this.planList[0]).length == 0
       ) {
-        this.msgSuccess("至少添加一条计划货量");
+        this.$message.error("至少添加一条计划货量");
       } else if (pidList.length != this.planList.length) {
         this.$confirm("计划货量存在未保存数据，是否保存?", "提示", {
           confirmButtonText: "确定",
@@ -1750,7 +1750,7 @@ export default {
           }
         });
       } else {
-        this.msgSuccess("请勿重复提交");
+        this.$message.error("请勿重复提交");
       }
     },
     delplansRow(index, rows, row) {
@@ -1775,7 +1775,7 @@ export default {
           }
         });
       } else {
-        this.msgSuccess("此条数据没有提交，不能申请撤回");
+        this.$message.error("此条数据没有提交，不能申请撤回");
       }
     },
     changeplansRow(row) {
@@ -1788,7 +1788,7 @@ export default {
           }
         });
       } else {
-        this.msgSuccess("请勿重复变更");
+       this.$message.error("请勿重复变更");
       }
     },
     total(row) {

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -1279,10 +1279,10 @@
       </el-form>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm">提交 </el-button>
+      <el-button type="primary" @click="submitForm">提 交</el-button>
       <!-- <el-button type="success" @click="submitFix">修改</el-button> -->
       <!-- <el-button type="success" @click="submitAllowChanges">修 改</el-button> -->
-      <el-button type="info" @click="submitSave">保 存</el-button>
+      <el-button type="info" @click="submitSave" :disabled="disabled">保 存</el-button>
       <!-- <el-button type="warning" @click="submitRetreat">撤 回</el-button> -->
       <el-button @click="showDialog = false">取 消</el-button>
     </span>
@@ -1587,7 +1587,7 @@ export default {
       let arr = this.schedulingList;
       let arr2 = arr.filter((e) => e.cntrId == row.cntrId && e.cntrId != null);
       if (arr2.length != 0) {
-        this.msgSuccess("调度安排已插入此箱型数据，不能删除");
+        this.$message.error("调度安排已插入此箱型数据，不能删除");
       } else {
         this.cntrIdList
           .filter((item) => item.dictValue == row.cntrId)
@@ -1617,7 +1617,10 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (!this.vehicleList.length) {
-            return this.msgSuccess("车辆安排不能为空");
+            return this.$message.error("车辆安排不能为空");
+          }
+          if(this.schedulingList[0].cntrQty!=this.schedulingList[0].carQty){
+            return this.$message.error("调度安排存在未安排的货量");
           }
           this.DList.map((e) => {
             return (e.fDc = "D");
@@ -1643,11 +1646,11 @@ export default {
               this.vehicleList[li].billStatus != 6 &&
               this.vehicleList[li].billStatus != 3
             ) {
-              return this.msgSuccess("车辆安排存在未提交的数据");
+              return this.$message.error("车辆安排存在未提交的数据");
             }
           }
           if (num > this.schedulingList[0].cntrQty) {
-            return this.msgSuccess("车辆安排货量已超过计划货量");
+            return this.$message.error("车辆安排货量已超过计划货量");
           }
           let arr2 = [];
           let arr = this.vehicleList.filter((e) => e.billStatus == 6);
@@ -1664,7 +1667,7 @@ export default {
           );
           formData.append("plans", JSON.stringify(this.schedulingList[0]));
           addFtmsorderbillscars(formData).then((response) => {
-            this.msgSuccess("新增成功");
+            this.msgSuccess("提交成功");
             this.$parent.getList();
             this.showDialog = false;
           });
@@ -1809,7 +1812,7 @@ export default {
           }
         });
       } else {
-        this.msgSuccess("请勿重复提交");
+        this.$message.error("请勿重复提交");
       }
     },
     delscarsRow(index, rows, row) {
@@ -1846,7 +1849,7 @@ export default {
           }
         });
       } else {
-        this.msgSuccess("此条数据没有提交，不能申请撤回");
+        this.$message.error("此条数据没有提交，不能申请撤回");
       }
     },
     changescarsRow(row) {
@@ -1858,7 +1861,7 @@ export default {
           }
         });
       } else if (row.billStatus == 5) {
-        this.msgSuccess("请勿重复变更");
+        this.$message.error("请勿重复变更");
       } else {
         this.msgSuccess("允许变更");
         this.$set(row, "billStatus", 5);

src/views/warehouseBusiness/cargoClearance/index.vue

@@ -378,6 +378,8 @@
         :width="item.width"
         :prop="item.label"
         align="center"
+        :show-overflow-tooltip="true"
+        sortable
       />
       <!--      <el-table-column  label="制单人" align="center" prop="createBy" fixed/>-->
       <!--      <el-table-column  label="仓管员" width="100" align="center" sortable prop="fStorekeeper" fixed/>-->

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -349,6 +349,8 @@
         :prop="item.label"
         align="center"
         :fixed="item.fixed"
+        :show-overflow-tooltip="true"
+        sortable
       />
       <!--      <el-table-column  label="制单人" align="center" prop="createBy" fixed />-->
       <!--      <el-table-column width="220" label="货权方" sortable align="center" prop="fCorpid" fixed/>-->
@@ -717,29 +719,59 @@
                 :data="CntrTable"
                 style="width: 80%"
                 :header-cell-style="{ lineHeight: '16px' }"
+                height="139"
               >
-                <el-table-column prop="fCntrid " label="箱型">
+                <el-table-column
+                  prop="fCntrid "
+                  label="箱型"
+                  header-align="center"
+                  align="center"
+                >
                   <template slot-scope="scope">
                     <el-input
-                      placeholder="请输入箱号"
-                      v-model="scope.row.fCntrid "
+                      placeholder="请输入箱型"
+                      v-model="scope.row.fCntrid"
+                      size="mini"
                     >
                     </el-input>
                   </template>
                 </el-table-column>
-                <el-table-column prop="fCntrcount" label="箱量">
+                <el-table-column
+                  prop="fCntrcount"
+                  label="箱量"
+                  header-align="center"
+                  align="center"
+                >
                   <template slot-scope="scope">
                     <el-input
                       placeholder="请输入箱量"
                       v-model="scope.row.fCntrcount"
+                      size="mini"
                     >
                     </el-input>
                   </template>
-                   </el-table-column>
+                </el-table-column>
+                <el-table-column
+                  prop="fCntrcount"
+                  label="操作"
+                  header-align="center"
+                  align="center"
+                  width="50"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      @click.native.prevent="deleteRow(scope.$index, CntrTable)"
+                      icon="el-icon-delete"
+                      ></el-button
+                    >
+                  </template>
+                </el-table-column>
               </el-table>
-              <div style="display: flex; justify-content: center;width: 80%">
-                <el-tag size="mini" class="tag-hover"
-                  @click="addRow"><i class="el-icon-plus"></i
+              <div style="display: flex; justify-content: center; width: 80%">
+                <el-tag class="tag-hover" @click="addRow" style="border-top-left-radius: 0;border-top-right-radius: 0;height: 15px;padding: 0px 4px;line-height: 12px;"
+                  ><i class="el-icon-plus"></i
                 ></el-tag>
               </div>
             </el-form-item>
@@ -4428,11 +4460,9 @@ export default {
 .el-icon-full-screen:before {
   content: "\e719";
 }
+</style>
+<style lang="scss">
 .tag-hover:hover {
   background-color: #d9ebfb;
 }
-.tag-hover {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-}
 </style>

src/views/warehouseBusiness/inStock/index.vue

@@ -874,55 +874,123 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-            <el-form-item
-              label="司机身份证"
-              prop="fDriverIdCar"
-              :rules="{
-                required: isrequired_s === 1 ? true : false,
-                message: '请选择',
-                trigger: ['blur', 'change'],
-              }"
-            >
-              <el-input
-                v-model="form.fDriverIdCar"
-                style="width: 80%"
-                :disabled="browseStatus || formBrowseStatus"
-                placeholder="司机身份证"
-              />
-            </el-form-item>
+          <el-col :span="16">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="司机身份证"
+                  prop="fDriverIdCar"
+                  :rules="{
+                    required: isrequired_s === 1 ? true : false,
+                    message: '请选择',
+                    trigger: ['blur', 'change'],
+                  }"
+                >
+                  <el-input
+                    v-model="form.fDriverIdCar"
+                    style="width: 80%"
+                    :disabled="browseStatus || formBrowseStatus"
+                    placeholder="司机身份证"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="司机电话"
+                  prop="fDriverTel"
+                  :rules="{
+                    required: isrequired_s === 1 ? true : false,
+                    message: '请选择',
+                    trigger: ['blur', 'change'],
+                  }"
+                >
+                  <el-input
+                    v-model="form.fDriverTel"
+                    style="width: 80%"
+                    :disabled="browseStatus || formBrowseStatus"
+                    placeholder="司机电话"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark">
+                  <el-input
+                    style="width: 92%"
+                    v-model="form.remark"
+                    type="textarea"
+                    :disabled="browseStatus"
+                    placeholder="请输入内容"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-col>
-          <el-col :span="8">
-            <el-form-item
-              label="司机电话"
-              prop="fDriverTel"
-              :rules="{
-                required: isrequired_s === 1 ? true : false,
-                message: '请选择',
-                trigger: ['blur', 'change'],
-              }"
-            >
-              <el-input
-                v-model="form.fDriverTel"
+           <el-col :span="8">
+            <el-form-item>
+              <el-table
+                :data="CntrTable"
                 style="width: 80%"
-                :disabled="browseStatus || formBrowseStatus"
-                placeholder="司机电话"
-              />
+                :header-cell-style="{ lineHeight: '16px' }"
+                height="139"
+              >
+                <el-table-column
+                  prop="fCntrid "
+                  label="箱型"
+                  header-align="center"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      placeholder="请输入箱型"
+                      v-model="scope.row.fCntrid"
+                      size="mini"
+                    >
+                    </el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fCntrcount"
+                  label="箱量"
+                  header-align="center"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      placeholder="请输入箱量"
+                      v-model="scope.row.fCntrcount"
+                      size="mini"
+                    >
+                    </el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fCntrcount"
+                  label="操作"
+                  header-align="center"
+                  align="center"
+                  width="50"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      @click.native.prevent="deleteRow(scope.$index, CntrTable)"
+                      icon="el-icon-delete"
+                    ></el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div style="display: flex; justify-content: center; width: 80%">
+                <el-tag class="tag-hover" @click="addRow"
+                  ><i class="el-icon-plus"></i
+                ></el-tag>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="14">
-            <el-form-item label="备注" prop="remark">
-              <el-input
-                style="width: 100%"
-                v-model="form.remark"
-                type="textarea"
-                :disabled="browseStatus"
-                placeholder="请输入内容"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="2">
             <el-form-item>
               <el-button
@@ -4364,6 +4432,7 @@ export default {
         fGoodsid: [{ required: true, message: " ", trigger: "blur" }],
       },
       defaultTitle: [],
+      CntrTable: [{}],
     };
   },
   created() {
@@ -4427,6 +4496,10 @@ export default {
     }
   },
   methods: {
+    addRow() {
+      var obj = {};
+      this.CntrTable.push(obj);
+    },
     handleCommand(command) {
       for (let corp in this.fMblnoOptions) {
         if (this.form.fCorpid === this.fMblnoOptions[corp].fId) {
@@ -5713,6 +5786,7 @@ export default {
       this.addOrUpdateVisible = false;
       this.addOrUpdateVisib = false;
       this.weightList = false;
+      this.CntrTable = [{}];
       this.form = {
         fId: null,
         fBillno: null,
@@ -7145,7 +7219,7 @@ export default {
                     });
                   });
               } else {
-                this.mblnoStatus=""
+                this.mblnoStatus = "";
                 this.msgSuccess("保存成功");
                 this.form = response.data.warehouseBills;
                 this.$set(this.form, "fEta", Date.parse(this.form.fEta));
@@ -7734,4 +7808,14 @@ export default {
 .print_form {
   font-size: 12px;
 }
+.tag-hover:hover {
+  background-color: #d9ebfb;
+}
+.tag-hover {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  height: 15px;
+  padding: 0px 4px;
+  line-height: 12px;
+}
 </style>

src/views/warehouseBusiness/outStock/index.vue

@@ -377,6 +377,8 @@
         :prop="item.label"
         align="center"
         :fixed="item.fixed"
+        :show-overflow-tooltip="true"
+        sortable
       />
       <!--      <el-table-column  label="制单人" align="center" prop="createBy" fixed/>-->
       <!--      <el-table-column  label="仓管员" width="100" align="center" sortable prop="fStorekeeper" fixed/>-->
@@ -861,35 +863,106 @@
         </el-row>
 
         <el-row>
-          <el-col :span="8">
-            <el-form-item
-              label="司机身份证"
-              prop="fDriverIdCar"
-              :rules="{
-                required: isrequired_s === 1 ? true : false,
-                message: '请选择',
-                trigger: ['blur', 'change'],
-              }"
-            >
-              <el-input
-                v-model="form.fDriverIdCar"
-                :disabled="browseStatus || formBrowseStatus"
-                style="width: 80%"
-                placeholder="请输司机身份证"
-              />
-            </el-form-item>
+          <el-col :span="16">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="司机身份证"
+                  prop="fDriverIdCar"
+                  :rules="{
+                    required: isrequired_s === 1 ? true : false,
+                    message: '请选择',
+                    trigger: ['blur', 'change'],
+                  }"
+                >
+                  <el-input
+                    v-model="form.fDriverIdCar"
+                    :disabled="browseStatus || formBrowseStatus"
+                    style="width: 80%"
+                    placeholder="请输司机身份证"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark">
+                  <el-input
+                    style="width: 92%"
+                    v-model="form.remark"
+                    type="textarea"
+                    :disabled="browseStatus"
+                    placeholder="请输入内容"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="备注" prop="remark">
-              <el-input
-                style="width: 100%"
-                v-model="form.remark"
-                type="textarea"
-                :disabled="browseStatus"
-                placeholder="请输入内容"
-              />
+          <el-col :span="8"> 
+               <el-form-item>
+              <el-table
+                :data="CntrTable"
+                style="width: 80%"
+                :header-cell-style="{ lineHeight: '16px' }"
+                height="139"
+              >
+                <el-table-column
+                  prop="fCntrid "
+                  label="箱型"
+                  header-align="center"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      placeholder="请输入箱型"
+                      v-model="scope.row.fCntrid"
+                      size="mini"
+                    >
+                    </el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fCntrcount"
+                  label="箱量"
+                  header-align="center"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      placeholder="请输入箱量"
+                      v-model="scope.row.fCntrcount"
+                      size="mini"
+                    >
+                    </el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fCntrcount"
+                  label="操作"
+                  header-align="center"
+                  align="center"
+                  width="50"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      @click.native.prevent="deleteRow(scope.$index, CntrTable)"
+                      icon="el-icon-delete"
+                      ></el-button
+                    >
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div style="display: flex; justify-content: center; width: 80%">
+                <el-tag class="tag-hover" @click="addRow"
+                  ><i class="el-icon-plus"></i
+                ></el-tag>
+              </div>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item>
               <el-button
@@ -903,6 +976,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+
         <div v-if="detailsHidden">
           <el-row style="margin-top: 30px">
             <el-col :span="8">
@@ -4091,10 +4165,11 @@ export default {
       fBillstatusOptions: [],
       // 费用名称
       fWbuOptions: [],
+      CntrTable: [{}],
       approVal: false,
       // 计价单位
       jFeetunitOptions: [],
-      mblnoStatus:"",
+      mblnoStatus: "",
       // 查询参数
       queryParams: {
         fWarehouselocid: null,
@@ -4251,6 +4326,10 @@ export default {
     }
   },
   methods: {
+      addRow() {
+      var obj = {};
+      this.CntrTable.push(obj);
+    },
     handleCommand(command) {
       console.log(command);
       for (let corp in this.fMblnoOptions) {
@@ -4738,7 +4817,7 @@ export default {
       });
     },
     cancelTwo() {
-      this.mblnoStatus=""
+      this.mblnoStatus = "";
       this.open = false;
       let view = {
         fullPath: "/business/outStock",
@@ -4763,7 +4842,7 @@ export default {
     },
     //关闭弹框的事件
     addCloseDialog() {
-      this.mblnoStatus=""
+      this.mblnoStatus = "";
       this.getList();
     },
     // 上传成功返回数据
@@ -5515,7 +5594,7 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.mblnoStatus=""
+      this.mblnoStatus = "";
       this.idCopy = null;
       this.open = false;
       this.fGrossweight = 0;
@@ -5576,7 +5655,7 @@ export default {
         fCntqty: null,
         fBusinessType: null,
       };
-      this.mblnoStatus ="";
+      this.mblnoStatus = "";
       this.deptOptions = [];
       this.userOptions = [];
       this.fSbuOptions = [];
@@ -5598,6 +5677,7 @@ export default {
       this.editDialogClosed_ss = false;
       this.storageAgreements = false;
       this.browseStatus = false;
+      this.CntrTable = [{}];
       this.doNot = false;
       this.resetForm("form");
     },
@@ -6767,7 +6847,7 @@ export default {
                     });
                   });
               } else {
-                this.mblnoStatus =""
+                this.mblnoStatus = "";
                 this.msgSuccess("保存成功");
                 this.form = response.data.warehouseBills;
                 this.$set(
@@ -7332,4 +7412,14 @@ export default {
 .print_form {
   font-size: 12px;
 }
+.tag-hover:hover {
+  background-color: #d9ebfb;
+}
+.tag-hover {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  height: 15px;
+  padding: 0px 4px;
+  line-height: 12px;
+}
 </style>

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -377,6 +377,8 @@
         :width="item.width"
         :prop="item.label"
         align="center"
+        :show-overflow-tooltip="true"
+        sortable
       />
       <!--      <el-table-column  label="制单人" align="center" prop="createBy" fixed/>-->
       <!--      <el-table-column  label="仓管员" width="100" align="center" sortable prop="fStorekeeper" fixed/>-->
@@ -842,75 +844,112 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item
-              label="车队"
-              prop="fFleet"
-              :rules="{
-                required: isrequired === 1 ? true : false,
-                message: '请选择',
-                trigger: ['blur', 'change'],
-              }"
-            >
-              <el-select
-                style="width: 80%"
-                v-model="form.fFleet"
-                filterable
-                remote
-                :remote-method="fleetRemoteMethod"
-                :disabled="contrOl"
-                placeholder="请输入车队"
-              >
-                <el-option
-                  v-for="(dict, index) in fleetOptions"
-                  :key="index.fId"
-                  :label="dict.fName"
-                  :value="dict.fId"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
         </el-row>
         <el-row>
-          <el-col :span="15">
-            <el-form-item label="备注" prop="remark">
-              <el-input
-                v-model="form.remark"
-                :disabled="browseStatus"
-                type="textarea"
-                placeholder="请输入内容"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
+            <el-col :span="16">
+              <el-row>
+                <el-col :span="12">
+                  <el-form-item
+                    label="车队"
+                    prop="fFleet"
+                    :rules="{
+                      required: isrequired === 1 ? true : false,
+                      message: '请选择',
+                      trigger: ['blur', 'change'],
+                    }"
+                  >
+                    <el-select
+                      style="width: 80%"
+                      v-model="form.fFleet"
+                      filterable
+                      remote
+                      :remote-method="fleetRemoteMethod"
+                      :disabled="contrOl"
+                      placeholder="请输入车队"
+                    >
+                      <el-option
+                        v-for="(dict, index) in fleetOptions"
+                        :key="index.fId"
+                        :label="dict.fName"
+                        :value="dict.fId"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item label="备注" prop="remark">
+                    <el-input
+                    style="width: 92%"
+                      v-model="form.remark"
+                      :disabled="browseStatus"
+                      type="textarea"
+                      placeholder="请输入内容"
+                    />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-col>
+             <el-col :span="8">
             <el-form-item>
               <el-table
                 :data="CntrTable"
                 style="width: 80%"
                 :header-cell-style="{ lineHeight: '16px' }"
+                height="139"
               >
-                <el-table-column prop="fCntrid " label="箱型">
+                <el-table-column
+                  prop="fCntrid "
+                  label="箱型"
+                  header-align="center"
+                  align="center"
+                >
                   <template slot-scope="scope">
                     <el-input
-                      placeholder="请输入箱号"
-                      v-model="scope.row.fCntrid "
+                      placeholder="请输入箱型"
+                      v-model="scope.row.fCntrid"
+                      size="mini"
                     >
                     </el-input>
                   </template>
                 </el-table-column>
-                <el-table-column prop="fCntrcount" label="箱量">
+                <el-table-column
+                  prop="fCntrcount"
+                  label="箱量"
+                  header-align="center"
+                  align="center"
+                >
                   <template slot-scope="scope">
                     <el-input
                       placeholder="请输入箱量"
                       v-model="scope.row.fCntrcount"
+                      size="mini"
                     >
                     </el-input>
                   </template>
-                   </el-table-column>
+                </el-table-column>
+                <el-table-column
+                  prop="fCntrcount"
+                  label="操作"
+                  header-align="center"
+                  align="center"
+                  width="50"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      @click.native.prevent="deleteRow(scope.$index, CntrTable)"
+                      icon="el-icon-delete"
+                      ></el-button
+                    >
+                  </template>
+                </el-table-column>
               </el-table>
-              <div style="display: flex; justify-content: center;width: 80%">
-                <el-tag size="mini" class="tag-hover"
-                  @click="addRow"><i class="el-icon-plus"></i
+              <div style="display: flex; justify-content: center; width: 80%">
+                <el-tag class="tag-hover" @click="addRow"
+                  ><i class="el-icon-plus"></i
                 ></el-tag>
               </div>
             </el-form-item>
@@ -3556,7 +3595,7 @@ export default {
       approvalStatus: false,
       Lander: "",
       Operator: "",
-      mblnoStatus:"",
+      mblnoStatus: "",
       cancelButton: true,
       approve: false,
       disappear: false,
@@ -3747,7 +3786,7 @@ export default {
         fWarehouseid: null,
         fBstime: "",
       },
-      CntrTable:[{}],
+      CntrTable: [{}],
       // 表单校验
       rules: {
         fDeptid: [{ required: true, message: " ", trigger: "blur" }],
@@ -3826,7 +3865,7 @@ export default {
     this.Jump();
   },
   methods: {
-   addRow() {
+    addRow() {
       var obj = {};
       this.CntrTable.push(obj);
     },
@@ -4372,7 +4411,7 @@ export default {
       });
     },
     returnData() {
-      this.mblnoStatus =""
+      this.mblnoStatus = "";
       this.addOrUpdateVisib = false;
       this.open = false;
       this.homepaGe();
@@ -4393,7 +4432,7 @@ export default {
     },
     //关闭弹框的事件
     addCloseDialog() {
-      this.mblnoStatus =""
+      this.mblnoStatus = "";
       this.getList();
     },
     // 上传成功返回数据
@@ -4946,7 +4985,7 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.mblnoStatus =""
+      this.mblnoStatus = "";
       this.open = false;
       this.reset();
     },
@@ -5001,8 +5040,8 @@ export default {
         fCntrtype: null,
         fCntqty: null,
       };
-      this.mblnoStatus ="";
-      this.CntrTable=[{}];
+      this.mblnoStatus = "";
+      this.CntrTable = [{}];
       this.deptOptions = [];
       this.userOptions = [];
       this.fSbuOptions = [];
@@ -6940,5 +6979,8 @@ export default {
 .tag-hover {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
+  height: 15px;
+  padding: 0px 4px;
+  line-height: 12px;
 }
 </style>