提交巡检

src/api/warehouseCheck/index.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询列表
 export function listCorps(query) {
     return request({
-        url: 'warehouseBusiness/warehouseCheck/listWarehouseCheck',
+        url: 'warehouse/check/list',
         method: 'get',
         params:query
     })
@@ -18,11 +18,8 @@ export function delLog(fId) {
 // 查询明细
 export function information(query) {
     return request({
-        url: 'warehouseBusiness/warehouseCheck/list',
-        method: 'get',
-        params: {
-            fId: query
-        }
+        url: '/warehouse/check/'+query,
+        method: 'get'
     })
 }
 //修改
@@ -36,11 +33,21 @@ export function updateLog(data) {
 //新增
 export function newlyAdded(data) {
     return request({
-        url: 'warehouseBusiness/warehouseCheck/add',
+        url: '/warehouse/check/saveCheckAndItems',
         method: 'post',
         data:data
     })
 }
+// 获取对应角色的用户
+export function selectUserByRole() {
+    return request({
+        url: '/system/user/selectUserByRole',
+        method: 'get',
+        params: {
+            roleName:'仓储经理'
+        }
+    })
+}
 //修改
 export function savePicture(data) {
     return request({
@@ -49,3 +56,11 @@ export function savePicture(data) {
         data:data
     })
 }
+//查询图片
+export function pictureList(data) {
+    return request({
+        url: 'warehouseBusiness/warehouseCheck/updateDetail',
+        method: 'get',
+        data:data
+    })
+}

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -5862,6 +5862,7 @@ export default {
   },
   data() {
     return {
+      recordStatus:false,
       timeOut: '',
       plannedGrossWeight: 0,
       container: '',
@@ -7086,9 +7087,13 @@ export default {
       }
     },
     getForm() {
-      getWarehousebills(this.chiId).then((response) => {
+      let fId = null
+      if (this.chiId) fId = this.chiId
+      if (this.form.fId) fId = this.form.fId
+      getWarehousebills(fId).then((response) => {
         this.TFformdata(response.data.warehousebills);
-        if (!this.copyStatus) {
+        console.log(this.copyStatus)
+        if (!this.copyStatus || this.recordStatus === true) {
           if (response.data.warehouseBillsItem) {
             response.data.warehouseBillsItem.map((e) => {
               e.fLntype = e.fLntype ? e.fLntype.toString() : null;
@@ -7136,6 +7141,7 @@ export default {
           this.$set(this.form, "fNetweight", 0);
           this.$set(this.form, "fPlanvolumn", 0);
           this.$set(this.form, "fGrossweight", 0);
+          this.recordStatus = true
         }
       });
     },

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -2150,7 +2150,7 @@ export default {
       this.formList = row
       // this.$set(this.formLabelAlign,'mblno',row.mblno)
       this.$set(this.formLabelAlign,'sourceId',row.id)
-      selectStowage(row).then((response) => {
+      selectStowage().then((response) => {
         this.stowageDialog = true;
         if (response.rows) {
           this.stowageList = response.rows;

src/views/warehouseBusiness/warehouseCheck/index.vue

@@ -28,12 +28,18 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item label="巡检人" prop="fInspectorid">
-        <el-input
+        <el-select
             v-model="queryParams.fInspectorid"
-            placeholder="请输入巡检人"
-            clearable
-            size="small"
-        />
+            filterable
+            placeholder="请选择巡检人"
+        >
+          <el-option
+              v-for="(item, index) in patrolInspection"
+              :key="index.userId"
+              :label="item.userName"
+              :value="item.userId"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="巡检备注" prop="remark">
         <el-input
@@ -94,16 +100,32 @@
     <el-table v-loading="loading" :data="logList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <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="fInspectorid"/>
-      <el-table-column label="计划开始日期" align="center" prop="fBegintime"/>
-      <el-table-column label="计划结束日期" align="center" prop="fEndtime"/>
-      <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="fSystemnum"/>
-      <el-table-column label="备注" align="center" prop="remark"/>
+      <el-table-column label="仓库名称" align="center" prop="fWarehouseName"/>
+      <el-table-column label="巡检人" align="center" prop="fInspectorName"/>
+      <el-table-column label="巡检计划日期起" align="center" prop="fInspectorBeginDatetime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fInspectorBeginDatetime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡检计划日期止" align="center" prop="fInspectorEndDatetime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fInspectorEndDatetime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="制单人" align="center" prop="fCreateByName"/>
+      <el-table-column label="制单日期" align="center" prop="fCreateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fCreateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="fUpdateBy"/>
+      <el-table-column label="最新时间" align="center" prop="fUpdateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fUpdateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="系统编号" align="center" prop="fSystemNo"/>
+      <el-table-column label="备注" align="center" prop="fRemark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope"  style="width: 100px;">
           <el-button
@@ -136,9 +158,9 @@
     <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body :close-on-press-escape="false" :close-on-click-modal="false">
       <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="fWarehouseid">
+        <el-form-item label="仓库名称" prop="fWarehouseFid">
           <el-select
-              v-model="form.fWarehouseid"
+              v-model="form.fWarehouseFid"
               filterable
               placeholder="请选择仓库名称"
           >
@@ -150,23 +172,37 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="巡检日期" prop="fInspectiondate">
+        <el-form-item label="巡检日期起" prop="fInspectorBeginDatetime">
           <el-date-picker
-              v-model="form.fInspectiondate"
+              v-model="form.fInspectorBeginDatetime"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="巡检人" prop="fInspectorid">
-          <el-input
-              v-model="form.fInspectorid"
-              placeholder="请输入巡检人"
-              clearable
-              size="small"
-          />
+        <el-form-item label="巡检日期止" prop="fInspectorEndDatetime">
+          <el-date-picker
+              v-model="form.fInspectorEndDatetime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期">
+          </el-date-picker>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
+        <el-form-item label="巡检人" prop="fInspectorId">
+          <el-select
+              v-model="form.fInspectorId"
+              filterable
+              placeholder="请选择巡检人"
+          >
+            <el-option
+                v-for="(item, index) in patrolInspection"
+                :key="index.userId"
+                :label="item.userName"
+                :value="item.userId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="fRemark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" autosize/>
         </el-form-item>
       </el-form>
@@ -175,13 +211,13 @@
       </div>
       <div style="width: 100%;">
         <el-table
-            :data="formList"
+            :data="form.tWarehouseCheckItemsList"
             style="width: 100%">
           <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="fWarehouseFid">
             <template slot-scope="scope">
               <el-select
-                  v-model="scope.row.fWarehouseid"
+                  v-model="scope.row.fWarehouseFid"
                   filterable
                   placeholder="请选择仓库名称"
               >
@@ -194,36 +230,60 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="巡检人" align="center" prop="fInspectorid">
+          <el-table-column label="巡检人" align="center" prop="fInspectorId">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fInspectorid" placeholder="请输入内容"></el-input>
+              <el-select
+                  v-model="scope.row.fInspectorId"
+                  filterable
+                  placeholder="请选择巡检人"
+              >
+                <el-option
+                    v-for="(item, index) in patrolInspection"
+                    :key="index.userId"
+                    :label="item.userName"
+                    :value="item.userId"
+                ></el-option>
+              </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="计划日期" align="center" prop="fPlanneddate">
+          <el-table-column label="计划日期" align="center" prop="fInspectionDatetime">
             <template slot-scope="scope">
               <el-date-picker
                   style="width: 100%;"
-                  v-model="scope.row.fPlanneddate"
+                  v-model="scope.row.fInspectionDatetime"
                   value-format="yyyy-MM-dd"
                   type="date"
                   placeholder="选择日期">
               </el-date-picker>
             </template>
           </el-table-column>
-          <el-table-column label="最新巡检日期" align="center" prop="fLatestinspectdate">
+          <el-table-column label="最新巡检日期" align="center" prop="fUpdateTime">
             <template slot-scope="scope">
               <el-date-picker
                   style="width: 100%;"
-                  v-model="scope.row.fLatestinspectdate"
+                  disabled
+                  v-model="scope.row.fUpdateTime"
                   value-format="yyyy-MM-dd"
                   type="date"
                   placeholder="选择日期">
               </el-date-picker>
             </template>
           </el-table-column>
-          <el-table-column label="最新巡检人" align="center" prop="fLatestinspectorid">
+          <el-table-column label="最新巡检人" align="center" prop="fUpdateBy">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.fLatestinspectorid" placeholder="请输入内容"></el-input>
+              <el-select
+                  disabled
+                  v-model="scope.row.fUpdateBy"
+                  filterable
+                  placeholder="最新巡检人"
+              >
+                <el-option
+                    v-for="(item, index) in patrolInspection"
+                    :key="index.userId"
+                    :label="item.userName"
+                    :value="item.userId"
+                ></el-option>
+              </el-select>
             </template>
           </el-table-column>
           <el-table-column label="巡检记录" align="center">
@@ -231,6 +291,7 @@
               <el-button
                   size="mini"
                   type="text"
+                  :disabled="!scope.row.fId"
                   @click="pictureList(scope)"
                   icon="el-icon-document"
               >详情
@@ -269,9 +330,9 @@
           <!--              </el-date-picker>-->
           <!--            </template>-->
           <!--          </el-table-column>-->
-          <el-table-column label="备注" align="center" prop="remark">
+          <el-table-column label="备注" align="center" prop="fRemark">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.remark" placeholder="请输入备注"></el-input>
+              <el-input v-model="scope.row.fRemark" placeholder="请输入备注"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -359,7 +420,7 @@
 </template>
 
 <script>
-import {listCorps,delLog,information,updateLog,newlyAdded,savePicture} from '@/api/warehouseCheck/index'
+import {listCorps,delLog,information,updateLog,newlyAdded,savePicture,selectUserByRole} from '@/api/warehouseCheck/index'
 import {listWarehousesss} from "@/api/basicdata/warehouse";
 import {getToken} from "@/utils/auth";
 
@@ -371,6 +432,7 @@ export default {
       headers: {
         Authorization: "Bearer " + getToken(),
       },
+      patrolInspection:[],
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       warehouseOptions: [],
       fPlanneddate: [],
@@ -414,6 +476,10 @@ export default {
     };
   },
   created() {
+    selectUserByRole().then(res => {
+      this.patrolInspection = res.rows
+      console.log(res)
+    })
     listWarehousesss({fStatus: 0, delFlag: 0}).then((response) => {
       this.warehouseOptions = response.rows;
     });
@@ -435,7 +501,7 @@ export default {
     },
     //录入新行
     inputDetails(){
-      this.formList.push({
+      this.form.tWarehouseCheckItemsList.push({
         fWarehousename:'',
         fLatestinspectorid:'',
         fInspectorid:'',
@@ -552,6 +618,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.form.tWarehouseCheckItemsList = []
       this.title = "添加巡检详情";
     },
     /** 修改按钮操作 */
@@ -563,11 +630,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          let list = this.form
-          list.twarehousecheckitemsVOList = this.formList
-          newlyAdded(list).then(response => {
+          newlyAdded(this.form).then(response => {
             this.msgSuccess("新增成功");
-            this.open = false;
+            // this.open = false;
             this.getList();
           });
         }