修改问题

src/views/basicdata/fleet/carManage.vue

@@ -1,16 +1,26 @@
 <template>
   <div class="mod-carManage app-container">
     <!--    卡片 视图区域-->
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form
+      :inline="true"
+      :model="dataForm"
+      @keyup.enter.native="getDataList()"
+    >
       <el-form-item>
-        <el-input v-model="dataForm.fleetCompanyId" placeholder="车队id" clearable></el-input>
+        <el-input
+          v-model="dataForm.fleetCompanyId"
+          placeholder="车队id"
+          clearable
+        ></el-input>
       </el-form-item>
       <el-form-item>
         <!--        车辆管理添加驾驶员-->
         <!--车队可以加车辆-->
         <!--        个人照片改成身份证-->
         <el-button @click="getDataList()">查询</el-button>
-        <el-button type="primary" @click="addOrUpdateHandle()">添加车辆</el-button>
+        <el-button type="primary" @click="addOrUpdateHandle()"
+          >添加车辆</el-button
+        >
         <!--        <el-button v-if="isAuth('fleet:carManage:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>-->
       </el-form-item>
     </el-form>
@@ -18,7 +28,7 @@
       :data="dataList"
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
-      style="width: 100%;"
+      style="width: 100%"
     >
       <el-table-column
         type="selection"
@@ -37,6 +47,16 @@
       >
       </el-table-column>
       <el-table-column
+        prop="driverName"
+        header-align="center"
+        align="center"
+        width="120"
+        :show-overflow-tooltip="true"
+        label="司机名称"
+      >
+      </el-table-column>
+
+      <el-table-column
         prop="carNum"
         header-align="center"
         align="center"
@@ -214,7 +234,6 @@
       >
       </el-table-column>
 
-
       <el-table-column
         prop="outerSize"
         header-align="center"
@@ -256,7 +275,7 @@
       >
         <template slot-scope="scope">
           <span v-if="!scope.row.regiestDate"></span>
-          <span v-else>{{ scope.row.regiestDate.slice(0,10) }}</span>
+          <span v-else>{{ scope.row.regiestDate.slice(0, 10) }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -268,7 +287,7 @@
       >
         <template slot-scope="scope">
           <span v-if="!scope.row.abandonDate"></span>
-          <span v-else>{{ scope.row.abandonDate.slice(0,10) }}</span>
+          <span v-else>{{ scope.row.abandonDate.slice(0, 10) }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -280,7 +299,7 @@
       >
         <template slot-scope="scope">
           <span v-if="!scope.row.creatTime"></span>
-          <span v-else>{{ scope.row.creatTime.slice(0,10) }}</span>
+          <span v-else>{{ scope.row.creatTime.slice(0, 10) }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -290,40 +309,40 @@
         width="130"
         label="操作"
       >
-<!--        <template slot-scope="scope">-->
-<!--          <el-tooltip class="item" effect="dark" content="修改" :enterable="false" placement="top">-->
-<!--            <el-button-->
-<!--              v-hasPermi="['fleet:carManage:edit']"-->
-<!--              type="primary"-->
-<!--              icon="el-icon-edit"-->
-<!--              content="修改"-->
-<!--              size="mini"-->
-<!--              circle @click="addOrUpdateHandle(scope.row)"-->
-<!--            ></el-button>-->
-<!--          </el-tooltip>-->
-<!--          <el-tooltip class="item" effect="dark" content="删除" :enterable="false" placement="top">-->
-<!--            <el-button v-hasPermi="['fleet:carManage:delete']"-->
-<!--                       icon="el-icon-delete"-->
-<!--                       type="danger"-->
-<!--                       circle-->
-<!--                       size="mini" @click="deleteHandle(scope.row.Id)"-->
-<!--            ></el-button>-->
-<!--          </el-tooltip>-->
-<!--        </template>-->
+        <!--        <template slot-scope="scope">-->
+        <!--          <el-tooltip class="item" effect="dark" content="修改" :enterable="false" placement="top">-->
+        <!--            <el-button-->
+        <!--              v-hasPermi="['fleet:carManage:edit']"-->
+        <!--              type="primary"-->
+        <!--              icon="el-icon-edit"-->
+        <!--              content="修改"-->
+        <!--              size="mini"-->
+        <!--              circle @click="addOrUpdateHandle(scope.row)"-->
+        <!--            ></el-button>-->
+        <!--          </el-tooltip>-->
+        <!--          <el-tooltip class="item" effect="dark" content="删除" :enterable="false" placement="top">-->
+        <!--            <el-button v-hasPermi="['fleet:carManage:delete']"-->
+        <!--                       icon="el-icon-delete"-->
+        <!--                       type="danger"-->
+        <!--                       circle-->
+        <!--                       size="mini" @click="deleteHandle(scope.row.Id)"-->
+        <!--            ></el-button>-->
+        <!--          </el-tooltip>-->
+        <!--        </template>-->
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="addOrUpdateHandle(scope.row)"
-          >查看
+            >查看
           </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="deleteHandle(scope.row.Id)"
-          >删除
+            >删除
           </el-button>
         </template>
       </el-table-column>
@@ -339,76 +358,78 @@
     >
     </el-pagination>
     <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" :dataForm="editModel"
+    <add-or-update
+      v-if="addOrUpdateVisible"
+      ref="addOrUpdate"
+      @refreshDataList="getDataList"
+      :dataForm="editModel"
     ></add-or-update>
-
   </div>
 </template>
 
 <script>
-import { listFtmsorderbills ,deleted} from '@/api/fleet/carManage'
-import AddOrUpdate from './carManage-add-or-update'
+import { listFtmsorderbills, deleted } from "@/api/fleet/carManage";
+import AddOrUpdate from "./carManage-add-or-update";
 
 export default {
   data() {
     return {
       dataForm: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
       },
       editModel: {},
       dataList: [],
       totalPage: 0,
       dataListLoading: false,
       dataListSelections: [],
-      addOrUpdateVisible: false
-    }
+      addOrUpdateVisible: false,
+    };
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
   },
   activated() {
-    this.getDataList()
+    this.getDataList();
   },
   methods: {
     // 获取数据列表
     getDataList() {
-      this.dataListLoading = false
-      listFtmsorderbills(this.dataForm).then(data => {
-        console.log(data)
+      this.dataListLoading = false;
+      listFtmsorderbills(this.dataForm).then((data) => {
+        console.log(data);
         if (data && data.code === 200) {
-          this.dataList = data.rows
-          this.totalPage = data.total
+          this.dataList = data.rows;
+          this.totalPage = data.total;
         } else {
-          this.dataList = []
-          this.totalPage = 0
+          this.dataList = [];
+          this.totalPage = 0;
         }
-        this.dataListLoading = false
-      })
-
+        this.dataListLoading = false;
+      });
     },
     // 每页数
     sizeChangeHandle(val) {
-      this.dataForm.pageSize = val
-      console.log(val)
-      this.pageIndex = 1
-      this.getDataList()
+      this.dataForm.pageSize = val;
+      console.log(val);
+      this.pageIndex = 1;
+      this.getDataList();
     },
     // 当前页
     currentChangeHandle(val) {
-      console.log(val)
-      this.dataForm.pageNum = val
-      this.getDataList()
+      console.log(val);
+      this.dataForm.pageNum = val;
+      this.getDataList();
     },
     // 多选
     selectionChangeHandle(val) {
-      this.dataListSelections = val
+      this.dataListSelections = val;
     },
     // 新增 / 修改
     addOrUpdateHandle(row) {
-      this.addOrUpdateVisible = true
+      this.addOrUpdateVisible = true;
       if (row) {
-        this.editModel = row
+        this.editModel = row;
       } else {
         this.editModel = {
           id: null,
@@ -444,40 +465,51 @@ export default {
           businessInsuranceSrc: null,
           accpetCarrageInsuranceSrc: null,
           creatTime: null,
-          modificationTime: null
-        }
+          modificationTime: null,
+        };
       }
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.init()
-      })
+        this.$refs.addOrUpdate.init();
+      });
     },
     // 删除
     deleteHandle(id) {
-      let carManageIds = [id ? [id] : this.dataListSelections.map(item => {
-        return item.userId
-      })]
-      this.$confirm(`确定对[id=${carManageIds.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        deleted(carManageIds).then(data=>{
-          if (data && data.code === 200) {
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-                this.getDataList()
-              }
-            })
-          } else {
-            this.$message.error(data.msg)
-          }
+      let carManageIds = [
+        id
+          ? [id]
+          : this.dataListSelections.map((item) => {
+              return item.userId;
+            }),
+      ];
+      this.$confirm(
+        `确定对[id=${carManageIds.join(",")}]进行[${
+          id ? "删除" : "批量删除"
+        }]操作?`,
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
+          deleted(carManageIds).then((data) => {
+            if (data && data.code === 200) {
+              this.$message({
+                message: "操作成功",
+                type: "success",
+                duration: 1500,
+                onClose: () => {
+                  this.getDataList();
+                },
+              });
+            } else {
+              this.$message.error(data.msg);
+            }
+          });
         })
-      }).catch(() => {
-      })
-    }
-  }
-}
+        .catch(() => {});
+    },
+  },
+};
 </script>

src/views/basicdata/goods/index.vue

@@ -390,19 +390,16 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="商品类别" prop="fTypeid">
-              <el-select v-model="form.fTypeid" placeholder="请选择商品类别">
-                <el-option
-                  v-for="dict in fTypeidOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="parseInt(dict.dictValue)"
-                ></el-option>
-              </el-select>
+           <el-col :span="12">
+            <el-form-item label="按照箱号统计">
+              <el-radio-group v-model="form.ifCntrno">
+                <el-radio label="1">是</el-radio>
+                <el-radio label="0">否</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
+        
         <el-form-item label="备注" prop="remark">
           <el-input
             v-model="form.remark"
@@ -410,13 +407,17 @@
             placeholder="请输入内容"
           />
         </el-form-item>
-        <el-row>
+         <el-row>
           <el-col :span="12">
-            <el-form-item label="箱号">
-              <el-radio-group v-model="form.ifCntrno">
-                <el-radio label="1">是</el-radio>
-                <el-radio label="0">否</el-radio>
-              </el-radio-group>
+            <el-form-item label="商品类别" prop="fTypeid">
+              <el-select v-model="form.fTypeid" placeholder="请选择商品类别">
+                <el-option
+                  v-for="dict in fTypeidOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="parseInt(dict.dictValue)"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>

src/views/index.vue

@@ -645,7 +645,7 @@ export default {
           return "装卸货";
           break;
         case 60:
-          return "还卸柜子";
+          return "还卸柜";
           break;
         case 70:
           return "费用确认";

src/views/warehouseBusiness/cargoClearance/index.vue

@@ -361,6 +361,7 @@
         :show-overflow-tooltip="true"
         sortable
         fixed="left"
+        prop="fMblno"
       >
         <template slot-scope="scope">
           <el-link :underline="false" type="primary"

src/views/warehouseBusiness/inStock/index.vue

@@ -376,13 +376,14 @@
       <!--          :show-overflow-tooltip="true"-->
       <!--          sortable-->
       <!--        />-->
-       <el-table-column
+      <el-table-column
         label="提单号"
         width="180"
         align="center"
         :show-overflow-tooltip="true"
         sortable
         fixed="left"
+        prop="fMblno"
       >
         <template slot-scope="scope">
           <el-link :underline="false" type="primary"
@@ -1682,9 +1683,7 @@
                 <el-input
                   v-model="scope.row.fCntrno"
                   placeholder="箱号"
-                  :disabled="
-                    browseStatus ||scope.row.fBillstatus === 40
-                  "
+                  :disabled="browseStatus || scope.row.fBillstatus === 40"
                   show-word-limit
                 />
               </template>
@@ -3644,7 +3643,11 @@
                 <td>盘点日期</td>
                 <td>盘点人</td>
               </tr>
-              <tr style="height:17.8px" v-for="(item,index) in 10" :key="index">
+              <tr
+                style="height: 17.8px"
+                v-for="(item, index) in 10"
+                :key="index"
+              >
                 <td></td>
                 <td></td>
                 <td></td>
@@ -3652,7 +3655,7 @@
                 <td></td>
                 <td></td>
               </tr>
-              <tr style="height:50px">
+              <tr style="height: 50px">
                 <td>备注</td>
                 <td colspan="5"></td>
               </tr>
@@ -3798,6 +3801,7 @@ export default {
   },
   data() {
     return {
+      mblnoStatus: "",
       allfGrossweight: 0,
       allfNetweight: 0,
       idCopy: "",
@@ -4589,6 +4593,7 @@ export default {
     },
     //关闭弹窗
     handleClose() {
+      this.mblnoStatus = "";
       this.cancel();
     },
     //作业费协议跳转车队或劳务公司库存账
@@ -4935,6 +4940,7 @@ export default {
     },
     //首页审批跳转关闭返回首页
     cancelTwo() {
+      this.mblnoStatus = "";
       this.open = false;
       let view = {
         fullPath: "/business/inStock",
@@ -5684,6 +5690,7 @@ export default {
     // },
     // 取消按钮
     cancel() {
+      this.mblnoStatus = "";
       this.open = false;
       this.fGrossweight = 0;
       this.fNetweight = 0;
@@ -6696,7 +6703,6 @@ export default {
             }
           }
           if (dataList.length !== 0) {
-            console.log('1111:' + JSON.stringify(this.form))
             let formData = new window.FormData();
             formData.append("warehouseBills", JSON.stringify(this.form));
             formData.append("warehousebillsitems", JSON.stringify(dataList));
@@ -6821,8 +6827,13 @@ export default {
             this.$message.error("请勿重复卸货");
             return false;
           }
-          if (this.Printinglist[warehouseCr].ifCntrno == 1&&!this.Printinglist[warehouseCr].fCntrno) {
-            this.$message.error("请输入第"+(Number(warehouseCr) + 1)+"行的箱号");
+          if (
+            this.Printinglist[warehouseCr].ifCntrno == 1 &&
+            !this.Printinglist[warehouseCr].fCntrno
+          ) {
+            this.$message.error(
+              "请输入第" + (Number(warehouseCr) + 1) + "行的箱号"
+            );
             return false;
           }
           // if (!this.Printinglist[warehouseCr].fQty || this.Printinglist[warehouseCr].fQty === 0) {
@@ -7067,7 +7078,7 @@ export default {
       }
     },
     // 提交保存保存成功
-    preservation(status) {
+    preservation() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (!this.dataList.length) {
@@ -7115,34 +7126,58 @@ export default {
               "tWarehousebillsfeesDr",
               JSON.stringify(this.warehouseDrList)
             );
+            formDatae.append("mblnoStatus", this.mblnoStatus);
             addWarehousebills(formDatae).then((response) => {
-              this.msgSuccess("保存成功");
-              this.form = response.data.warehouseBills;
-              this.$set(this.form, "fEta", Date.parse(this.form.fEta));
-              this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
-              this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
-              this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
-              this.$set(
-                this.form,
-                "createTime",
-                Date.parse(this.form.createTime)
-              );
-              // this.$set(this.form, "fChargedate",this.form.fChargedate);
-              this.dataList = response.data.warehousebillsitems;
-              for (let list in this.dataList) {
+              if (response.data == false) {
+                this.$confirm(response.msg, "提示", {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning",
+                })
+                  .then(() => {
+                    this.mblnoStatus = true;
+                    this.preservation();
+                  })
+                  .catch(() => {
+                    this.$message({
+                      type: "info",
+                      message: "已取消",
+                    });
+                  });
+              } else {
+                this.mblnoStatus=""
+                this.msgSuccess("保存成功");
+                this.form = response.data.warehouseBills;
+                this.$set(this.form, "fEta", Date.parse(this.form.fEta));
+                this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
+                this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
                 this.$set(
-                  this.dataList[list],
-                  "fBsdate",
-                  Date.parse(this.dataList[list].fBsdate)
+                  this.form,
+                  "fTrademodeid",
+                  this.form.fTrademodeid + ""
                 );
                 this.$set(
-                  this.dataList[list],
-                  "fBusinessType",
-                  this.dataList[list].fBusinessType + ""
+                  this.form,
+                  "createTime",
+                  Date.parse(this.form.createTime)
                 );
+                // this.$set(this.form, "fChargedate",this.form.fChargedate);
+                this.dataList = response.data.warehousebillsitems;
+                for (let list in this.dataList) {
+                  this.$set(
+                    this.dataList[list],
+                    "fBsdate",
+                    Date.parse(this.dataList[list].fBsdate)
+                  );
+                  this.$set(
+                    this.dataList[list],
+                    "fBusinessType",
+                    this.dataList[list].fBusinessType + ""
+                  );
+                }
+                this.fid = response.data.warehouseBills.fId;
+                this.getList();
               }
-              this.fid = response.data.warehouseBills.fId;
-              this.getList();
             });
           } else {
             for (let item in this.dataList) {

src/views/warehouseBusiness/outStock/index.vue

@@ -359,6 +359,7 @@
         :show-overflow-tooltip="true"
         sortable
         fixed="left"
+        prop="fMblno"
       >
         <template slot-scope="scope">
           <el-link :underline="false" type="primary"