提交出入库的收款信息金额支持修改

src/api/warehouseCheck/index.js

@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+// 查询详情列表
+export function listCorps(query) {
+    return request({
+        url: 'warehouseBusiness/warehouseCheck/listWarehouseCheck',
+        method: 'get',
+        params:query
+    })
+}
+// 删除
+export function delLog(query) {
+    return request({
+        url: 'warehouseBusiness/warehouseCheck/delById',
+        method: 'delete',
+        params:query
+    })
+}
+// 删除
+export function information(query) {
+    return request({
+        url: 'warehouseBusiness/warehouseCheck/listWarehouseCheck',
+        method: 'get'
+    })
+}

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -4057,9 +4057,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if (this.detailList.length === 0) {
-            return this.$message.error("请新增库存明细!");
-          }
+          // if (this.detailList.length === 0) {
+          //   return this.$message.error("请新增库存明细!");
+          // }
           this.updateDeduplication();
           for (let item in this.warehouseDrList) {
             if (!this.warehouseDrList[item].fCorpid) {

src/views/Warehousing/components/incomeMoney.vue

@@ -194,6 +194,7 @@
           <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fAmount"
+              :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
               placeholder="金额"
               show-word-limit
           />

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -3083,9 +3083,9 @@ export default {
           if (this.form.fCorpid === this.form.fTocorpid) {
             return this.$message.error("新客户不得与客户一致");
           }
-          if (this.detailList.length === 0) {
-            return this.$message.error("请新增库存明细!");
-          }
+          // if (this.detailList.length === 0) {
+          //   return this.$message.error("请新增库存明细!");
+          // }
           this.updateDeduplication();
           for (let item in this.warehouseDrList) {
             if (!this.warehouseDrList[item].fCorpid) {

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -7161,9 +7161,9 @@ export default {
         } else {
           this.$refs["form"].validate((valid) => {
             if (valid) {
-              if (this.detailList.length === 0) {
-                return this.$message.error("请新增库存明细!");
-              }
+              // if (this.detailList.length === 0) {
+              //   return this.$message.error("请新增库存明细!");
+              // }
               for (let item in this.warehouseDrList) {
                 if (!this.warehouseDrList[item].fCorpid) {
                   if (item === "fBusinessType") {

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -1373,7 +1373,7 @@
           >
             <template slot-scope="scope">
               <el-input
-                  disabled
+                  :disabled="browseStatus || scope.row.fSrcTypeId !== 0"
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   v-model="scope.row.fAmount"
                   placeholder="金额"
@@ -5050,9 +5050,9 @@ export default {
         } else {
           this.$refs["form"].validate((valid) => {
             if (valid) {
-              if (this.detailList.length === 0) {
-                return this.$message.error("请新增库存明细!");
-              }
+              // if (this.detailList.length === 0) {
+              //   return this.$message.error("请新增库存明细!");
+              // }
               this.updateDeduplication();
               for (let item in this.warehouseDrList) {
                 if (!this.warehouseDrList[item].fCorpid) {

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -4456,9 +4456,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if (this.detailList.length === 0) {
-            return this.$message.error("请新增库存明细!");
-          }
+          // if (this.detailList.length === 0) {
+          //   return this.$message.error("请新增库存明细!");
+          // }
           this.updateDeduplication();
           for (let item in this.warehouseDrList) {
             if (!this.warehouseDrList[item].fCorpid) {

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -847,17 +847,16 @@
                         size="mini"
                         type="text"
                         icon="el-icon-document-checked"
+                        v-if="scope.row.billKind === 'NN' && scope.row.billStatus >= 6"
                         @click.native.prevent="selectStowage(scope.row)"
-                        :disabled="scope.row.billKind != 'NN'"
                         v-hasPermi="['fleet:ftmsorderbillscars:edit']"
                     >配载</el-button>
                     <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-document-delete"
-                        @click.native.prevent="changeStowageRow(scope.row)"
-                        v-if="scope.row.billStatus >= 6 "
-                        :disabled="!scope.row.mBillNo"
+                        @click.native.prevent="changeStowageRow(scope.row,scope)"
+                        v-if="scope.row.billKind === 'MM' && scope.row.billStatus >= 6"
                         v-hasPermi="['fleet:ftmsorderbillscars:edit']"
                     >撤销配载</el-button>
                   </template>
@@ -1746,10 +1745,11 @@ export default {
     //     }
     //   });
     // },
-    changeStowageRow(row) {
+    changeStowageRow(row,scope) {
       revokeStowage(row).then((response) => {
         if (response.code == 200) {
           this.msgSuccess("配载撤销成功");
+          scope.row.billKind = 'NN'
           response.data.map((e, index) => {
             this.$set(this.vehicleList, index, e);
           });

src/views/warehouseBusiness/warehouseCheck/index.vue

@@ -1,40 +1,46 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="仓库名称" prop="fpid">
-        <el-input
-          v-model="queryParams.fPid"
-          placeholder="请输入仓库名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="仓库名称" prop="fWarehouseid">
+        <el-select
+            v-model="queryParams.fWarehouseid"
+            filterable
+            placeholder="请选择仓库名称"
+        >
+          <el-option
+              v-for="(item, index) in warehouseOptions"
+              :key="index.fId"
+              :label="item.fName"
+              :value="item.fId"
+          ></el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="计划日期" prop="fPid">
-        <el-input
-          v-model="queryParams.fPid"
-          placeholder="请输入计划日期"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="计划日期">
+        <el-date-picker
+            v-model="plannedDate"
+            @change="planDateMethod"
+            type="daterange"
+            :clearable="false"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :default-time="['00:00:00', '23:59:59']">
+        </el-date-picker>
       </el-form-item>
-      <el-form-item label="巡检人" prop="fPid">
+      <el-form-item label="巡检人" prop="inspector">
         <el-input
-          v-model="queryParams.fPid"
-          placeholder="请输入巡检人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.inspector"
+            placeholder="请输入巡检人"
+            clearable
+            size="small"
         />
       </el-form-item>
-      <el-form-item label="巡检备注" prop="fPid">
+      <el-form-item label="巡检备注" prop="remark">
         <el-input
-          v-model="queryParams.fPid"
-          placeholder="请输入巡检备注"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.remark"
+            placeholder="请输入巡检备注"
+            clearable
+            size="small"
         />
       </el-form-item>
       <el-form-item>
@@ -46,96 +52,109 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
+            type="success"
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
+            type="danger"
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
+            type="warning"
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+        >导出
+        </el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="resetQuery"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" index="index" />
-      <el-table-column label="仓库名称" align="center" prop="warehouse" />
-      <el-table-column label="计划日期" align="center" prop="planned" />
-      <el-table-column label="巡检日期" align="center" prop="planned" />
-      <el-table-column label="巡检人" align="center" prop="people" />
-      <el-table-column label="巡检备注" align="center" prop="remarks" />
+      <el-table-column type="selection" width="55" align="center" index="index"/>
+      <el-table-column label="序号" type="index" width="50" fixed align="center"/>
+      <el-table-column label="仓库名称" align="center" prop="fWarehousename"/>
+      <el-table-column label="巡检人" align="center" prop="inspector"/>
+      <el-table-column label="计划开始日期" align="center" prop="beginTime"/>
+      <el-table-column label="计划结束日期" align="center" prop="endTime"/>
+      <el-table-column label="制单人" align="center" prop="createBy"/>
+      <el-table-column label="制单日期" align="center" prop="createTime"/>
+      <el-table-column label="更新人" align="center" prop="updateBy"/>
+      <el-table-column label="更新日期" align="center" prop="updateTime"/>
+      <el-table-column label="系统编号" align="center" prop="systemNum"/>
+      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template slot-scope="scope"  style="width: 100px;">
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleAdd(scope.row)"
-          >修改</el-button>
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="viewDetails(scope.row)"
+          >查看
+          </el-button>
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
     />
 
     <!-- 添加或修改入出库状态对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" style="display:flex;flex-wrap: wrap;justify-content: space-between">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px"
+               style="display:flex;flex-wrap: wrap;justify-content: space-between">
         <el-form-item label="仓库名称" prop="fPid">
-          <el-input v-model="form.fPid" style="width: 250px;" placeholder="请输入仓库名称" />
+          <el-input v-model="form.fPid" style="width: 250px;" placeholder="请输入仓库名称"/>
         </el-form-item>
         <el-form-item label="巡检日期" prop="fPid">
-          <el-input v-model="form.fPid" style="width: 250px;" placeholder="请输入巡检日期" />
+          <el-input v-model="form.fPid" style="width: 250px;" placeholder="请输入巡检日期"/>
         </el-form-item>
         <el-form-item label="巡检人" prop="fPid">
-          <el-input v-model="form.fPid" style="width: 250px;" placeholder="请输入仓库名称" />
+          <el-input v-model="form.fPid" style="width: 250px;" placeholder="请输入仓库名称"/>
         </el-form-item>
       </el-form>
       <el-form ref="form" :model="form" :rules="rules" label-width="50px">
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-      </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
+        </el-form-item>
       </el-form>
       <el-card class="box-card">
         <div slot="header" class="clearfix">
           <span>巡检照片</span>
-<!--          <el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>-->
+          <!--          <el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>-->
         </div>
         <div class="text item" style="display: flex;justify-content: space-between">
           <img src="https://www.dmu.com.cn/images/banner/banner41.jpg?v=2" style="width: 20%;" alt="">
@@ -153,13 +172,16 @@
 </template>
 
 <script>
+import {listCorps,delLog,information} from '@/api/warehouseCheck/index'
+import {listWarehousesss} from "@/api/basicdata/warehouse";
 
 export default {
   name: "Log",
-  components: {
-  },
+  components: {},
   data() {
     return {
+      warehouseOptions: [],
+      plannedDate: [],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -175,15 +197,15 @@ export default {
       // 入出库状态表格数据
       logList: [
         {
-          warehouse:'途宝仓库-A1',
-          planned:'2021-04-07',
-          people:'张三',
-          remarks:'无异常'
-        },{
-          warehouse:'途宝仓库-A2',
-          planned:'2021-04-07',
-          people:'张三',
-          remarks:'无异常'
+          warehouse: '途宝仓库-A1',
+          planned: '2021-04-07',
+          people: '张三',
+          remarks: '无异常'
+        }, {
+          warehouse: '途宝仓库-A2',
+          planned: '2021-04-07',
+          people: '张三',
+          remarks: '无异常'
         }
       ],
       // 弹出层标题
@@ -194,25 +216,40 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        fPid: null,
-        fItmeid: null,
-        fItmestatus: null,
-        fBillstatus: null,
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {}
     };
   },
   created() {
+    listWarehousesss({fStatus: 0, delFlag: 0}).then((response) => {
+      this.warehouseOptions = response.rows;
+    });
     this.getList();
   },
   methods: {
+    //查看明细
+    viewDetails(row){
+      information
+    },
+    //拆分计划日期
+    planDateMethod() {
+      if (this.plannedDate) {
+        this.$set(this.queryParams, 'beginTime', this.plannedDate[0])
+        this.$set(this.queryParams, 'endTime', this.plannedDate[1])
+      }
+    },
     /** 查询入出库状态列表 */
     getList() {
-      this.loading = false;
+      listCorps(this.queryParams).then(res => {
+        if (res.code === 200) {
+          this.logList = res.rows
+          this.loading = false
+          this.total = res.total
+        }
+      })
     },
     // 取消按钮
     cancel() {
@@ -242,13 +279,17 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      }
+      this.plannedDate = []
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.fId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -289,7 +330,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return delLog(fIds);
       }).then(() => {
         this.getList();
@@ -303,7 +344,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return exportLog(queryParams);
       }).then(response => {
         this.download(response.msg);