入库功能调整

src/api/materialManagement/WareHouseService.js

@@ -57,11 +57,11 @@ export default class WareHouseService {
       data: param
     })
   }
-  findById (id) {
+  findById (id, status) {
     return request({
       url: '/material/management/wareHouse/findById',
       method: 'get',
-      params: {id: id}
+      params: {id: id, status: status}
     })
   }
   remove (id) {
@@ -85,4 +85,32 @@ export default class WareHouseService {
       data: data
     })
   }
+  backSourceData (id) {
+    return request({
+      url: '/material/management/wareHouse/backSourceData',
+      method: 'get',
+      params: {id: id}
+    })
+  }
+  findHiById (id) {
+    return request({
+      url: '/material/management/wareHouse/findHiById',
+      method: 'get',
+      params: {id: id}
+    })
+  }
+  findHiByHiId (id) {
+    return request({
+      url: '/material/management/wareHouse/findHiByHiId',
+      method: 'get',
+      params: {id: id}
+    })
+  }
+  findLastHiByid (id) {
+    return request({
+      url: '/material/management/wareHouse/findLastHiByid',
+      method: 'get',
+      params: {id: id}
+    })
+  }
 }

src/views/modules/flowable/task/TaskForm.vue

@@ -2,7 +2,7 @@
 <div>
   <h4 style="text-align:center">{{title}}</h4>
 
-  <el-tabs type="border-card" v-model="taskSelectedTab">
+  <el-tabs type="border-card" v-model="taskSelectedTab" @tab-click="onTabChange">
     <el-tab-pane label="表单信息" name="form-first">
       <component id="printForm" :status="status" :formReadOnly="formReadOnly" v-if="formType === '2'" :class="formReadOnly?'readonly':''" ref="form" :businessId="businessId" :is="form" @callBackFunc="callBackFunc" @changeLoading="changeLoading"></component>
 
@@ -23,6 +23,39 @@
     <el-tab-pane label="流转记录" v-if="procInsId" name="form-forth">
           <flow-step :historicTaskList="historicTaskList"/>
      </el-tab-pane>
+    <el-tab-pane label="修改历史" v-if="commonJS.isNotEmpty(wareHouseId)" name="form-sixth">
+      <vxe-table
+        border="inner"
+        size="mini"
+        max-height="1000px"
+        :data="dataListHi">
+        <vxe-column type="seq" width="60" title="序号"></vxe-column>
+        <vxe-column min-width="120" align="center" title="修改类型" field="updateTradeType">
+          <template v-slot="scope">
+            <span v-if="commonJS.isNotEmpty(scope.row.updateTradeType)"> {{scope.row.updateTradeType}} </span>
+            <span v-else> -- </span>
+          </template>
+        </vxe-column>
+        <vxe-column min-width="160" align="center" title="修改商品" field="updateTradeName">
+          <template v-slot="scope">
+            <span v-if="commonJS.isNotEmpty(scope.row.updateTradeName)"> {{scope.row.updateTradeName}} </span>
+            <span v-else> -- </span>
+          </template>
+        </vxe-column>
+        <vxe-column min-width="160" align="center" title="修改人" field="updateUser">
+          <template v-slot="scope">
+            <span v-if="scope.row.endflag === '2'">(创建人) {{scope.row.updateUser}} </span>
+            <span v-else>{{scope.row.updateUser}} </span>
+          </template>
+        </vxe-column>
+        <vxe-column min-width="160" align="center" title="修改时间" field="createDate"></vxe-column>
+        <vxe-column title="操作" width="150px" fixed="right" align="center">
+          <template  slot-scope="scope">
+            <el-button type="text" size="small" @click="hiDetail(scope.row)">修改详情</el-button>
+          </template>
+        </vxe-column>
+      </vxe-table>
+    </el-tab-pane>
   </el-tabs>
 
 
@@ -93,6 +126,7 @@
 <user-select-dialog title="选择转办用户" ref="transferUserSelectDialog" :limit="1" @doSubmit="selectUsersToTransferTask"></user-select-dialog>
 <user-select-dialog title="选择委派用户" ref="delegateUserSelectDialog" :limit="1" @doSubmit="selectUsersToDelateTask"></user-select-dialog>
 <user-select-dialog title="选择加签用户" ref="addSignTaskUserSelectDialog" @doSubmit="selectUsersToAddSignTask"></user-select-dialog>
+<WareHouseHi ref="wareHouseHi"></WareHouseHi>
 </div>
 </template>
 
@@ -111,6 +145,8 @@
   import ProcessService from '@/api/flowable/ProcessService'
   import WorkContractForm2 from '@/views/modules/sys/workContract/WorkContractForm2'
   import NoticeService from '@/api/flowable/NoticeService'
+  import WareHouseService from '@/api/materialManagement/WareHouseService'
+  import WareHouseHi from '@/views/modules/materialManagement/wareHouse/WareHouseHi'
   const _import = require('@/router/import-' + process.env.NODE_ENV)
   export default {
     taskDefExtensionService: null,
@@ -119,6 +155,7 @@
     flowCopyService: null,
     processService: null,
     noticeService: null,
+    wareHouseService: null,
     created () {
       this.taskService = new TaskService()
       this.taskDefExtensionService = new TaskDefExtensionService()
@@ -126,6 +163,7 @@
       this.flowCopyService = new FlowCopyService()
       this.processService = new ProcessService()
       this.noticeService = new NoticeService()
+      this.wareHouseService = new WareHouseService()
     },
     activated () {
       this.init()
@@ -209,7 +247,8 @@
       TaskBackNodes,
       FlowStep,
       FlowTimeLine,
-      WorkContractForm2
+      WorkContractForm2,
+      WareHouseHi
     },
     watch: {
       isAssign (val) {
@@ -254,6 +293,7 @@
         this.cUser = this.commonJS.isEmpty(this.$route.query.cUser) ? false : this.$route.query.cUser
         this.contractTitle = this.$route.query.contractTitle
         this.statusFlag = this.$route.query.statusFlag
+        this.wareHouseId = this.$route.query.wareHouseId
         if (this.commonJS.isEmpty(this.$route.query.isShow)) {
           this.isShow = 'true'
         } else {
@@ -308,7 +348,6 @@
       start (vars) {
         if (this.formType === '2') { // 外置表单
           this.$refs.form.startForm((businessTable, businessId, inputForm) => {
-            console.log(inputForm.title)
             vars = {...vars, ...inputForm}
             if (inputForm.procDefId) {
               this.procDefId = inputForm.procDefId
@@ -1001,6 +1040,21 @@
         } else {
           this.loading = false
         }
+      },
+      onTabChange (event) {
+        if (event.name === 'form-sixth') {
+          if (this.commonJS.isNotEmpty(this.wareHouseId)) {
+            this.wareHouseService.findHiById(this.wareHouseId).then(({data}) => {
+              this.dataListHi = data
+            })
+          }
+        }
+      },
+      // 打开入库修改历史详情页
+      hiDetail (row) {
+        if (this.commonJS.isNotEmpty(row.id)) {
+          this.$refs.wareHouseHi.init(row.id)
+        }
       }
     },
     data () {
@@ -1038,7 +1092,9 @@
           assignee: null
         },
         cUser: false,
-        loading: false
+        loading: false,
+        wareHouseId: '',
+        dataListHi: []
       }
     }
   }

src/views/modules/flowable/task/TaskFormDetail.vue

@@ -7,7 +7,7 @@
   <img  v-if="code === 4" class="process-status-img" src="../../../../assets/img/flowable/4.png"/>
   <img  v-if="code === 5" class="process-status-img" src="../../../../assets/img/flowable/5.png"/>
   <img  v-if="code === 6" class="process-status-img" src="../../../../assets/img/flowable/6.png"/>
-  <el-tabs type="border-card" v-model="selectedTab">
+  <el-tabs type="border-card" v-model="selectedTab" @tab-click="onTabChange">
     <el-tab-pane label="表单信息" name="form-first">
 
       <component :formReadOnly="formReadOnly" v-if="formType === '2'" :status="'taskFormDetail'"  :class="formReadOnly?'readonly':''" ref="form" :businessId="businessId" :is="form"></component>
@@ -29,8 +29,41 @@
     <el-tab-pane label="流转记录" v-if="procInsId" name="form-forth">
           <flow-step :historicTaskList="historicTaskList"/>
      </el-tab-pane>
+    <el-tab-pane label="修改历史" v-if="wareHouseId" name="form-sixth">
+      <vxe-table
+        border="inner"
+        size="mini"
+        max-height="1000px"
+        :data="dataListHi">
+        <vxe-column type="seq" width="60" title="序号"></vxe-column>
+        <vxe-column min-width="120" align="center" title="修改类型" field="updateTradeType">
+          <template v-slot="scope">
+            <span v-if="commonJS.isNotEmpty(scope.row.updateTradeType)"> {{scope.row.updateTradeType}} </span>
+            <span v-else> -- </span>
+          </template>
+        </vxe-column>
+        <vxe-column min-width="160" align="center" title="修改商品" field="updateTradeName">
+          <template v-slot="scope">
+            <span v-if="commonJS.isNotEmpty(scope.row.updateTradeName)"> {{scope.row.updateTradeName}} </span>
+            <span v-else> -- </span>
+          </template>
+        </vxe-column>
+        <vxe-column min-width="160" align="center" title="修改人" field="updateUser">
+          <template v-slot="scope">
+            <span v-if="scope.row.endflag === '2'">(创建人) {{scope.row.updateUser}} </span>
+            <span v-else>{{scope.row.updateUser}} </span>
+          </template>
+        </vxe-column>
+        <vxe-column min-width="160" align="center" title="修改时间" field="createDate"></vxe-column>
+        <vxe-column title="操作" width="150px" fixed="right" align="center">
+          <template  slot-scope="scope">
+            <el-button type="text" size="small" @click="hiDetail(scope.row)">修改详情</el-button>
+          </template>
+        </vxe-column>
+      </vxe-table>
+    </el-tab-pane>
   </el-tabs>
-
+  <WareHouseHi ref="wareHouseHi"></WareHouseHi>
 </div>
 </template>
 
@@ -43,17 +76,21 @@ import FlowTimeLine from '@/views/modules/flowable/components/FlowTimeLine'
 import TaskService from '@/api/flowable/TaskService'
 import FormService from '@/api/flowable/FormService'
 import ProcessService from '@/api/flowable/ProcessService'
-const _import = require('@/router/import-' + process.env.NODE_ENV)
+import WareHouseService from '@/api/materialManagement/WareHouseService'
+import WareHouseHi from '@/views/modules/materialManagement/wareHouse/WareHouseHi'
+  const _import = require('@/router/import-' + process.env.NODE_ENV)
   export default {
     taskDefExtensionService: null,
     taskService: null,
     formService: null,
     flowCopyService: null,
     porcessService: null,
+    wareHouseService: null,
     beforeCreate () {
       this.taskService = new TaskService()
       this.formService = new FormService()
       this.porcessService = new ProcessService()
+      this.wareHouseService = new WareHouseService()
     },
     activated () {
       this.init()
@@ -89,7 +126,8 @@ const _import = require('@/router/import-' + process.env.NODE_ENV)
       UserSelect,
       PreviewForm,
       FlowStep,
-      FlowTimeLine
+      FlowTimeLine,
+      WareHouseHi
       // FlowChart
     },
     watch: {
@@ -116,6 +154,7 @@ const _import = require('@/router/import-' + process.env.NODE_ENV)
         this.title = this.$route.query.formTitle
         this.businessId = this.$route.query.businessId
         this.procInsId = this.$route.query.procInsId
+        this.wareHouseId = this.$route.query.wareHouseId
         this.formReadOnly = true
         // this.$nextTick(() => {
         //   try {
@@ -132,6 +171,21 @@ const _import = require('@/router/import-' + process.env.NODE_ENV)
             console.log(e)
           }
         }, 500)
+      },
+      onTabChange (event) {
+        if (event.name === 'form-sixth') {
+          if (this.commonJS.isNotEmpty(this.wareHouseId)) {
+            this.wareHouseService.findHiById(this.wareHouseId).then(({data}) => {
+              this.dataListHi = data
+            })
+          }
+        }
+      },
+      // 打开入库修改历史详情页
+      hiDetail (row) {
+        if (this.commonJS.isNotEmpty(row.id)) {
+          this.$refs.wareHouseHi.init(row.id)
+        }
       }
     },
     data () {
@@ -151,7 +205,9 @@ const _import = require('@/router/import-' + process.env.NODE_ENV)
         taskDefKey: '',
         status: '',
         title: '',
-        businessId: ''
+        businessId: '',
+        wareHouseId: '',
+        dataListHi: []
       }
     }
   }

src/views/modules/flowable/task/TodoList.vue

@@ -265,7 +265,16 @@
         }).then(({data}) => {
           this.$router.push({
             path: '/flowable/task/TaskForm',
-            query: {formTitle: `${row.vars.title}`, cUser: cUser, isShow: false, formReadOnly: true, title: `审批【${row.task.name || ''}】`, ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId'), num: sum}
+            query: {
+              wareHouseId: row.processDefinitionName === '物资管理-入库修改' ? data.businessId : '',
+              formTitle: `${row.vars.title}`,
+              cUser: cUser,
+              isShow: false,
+              formReadOnly: true,
+              title: `审批【${row.task.name || ''}】`,
+              ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId'),
+              num: sum
+            }
           })
         })
       },

src/views/modules/materialManagement/file/MaterialManagementDialog.vue

@@ -5,7 +5,7 @@
       :title="title"
       :close-on-click-modal="false"
       v-dialogDrag
-      width="1400px"
+      width="800px"
       height="500px"
       @close="close"
       append-to-body

src/views/modules/materialManagement/wareHouse/WareHouseAddForm.vue

@@ -4,7 +4,7 @@
       :title="title"
       :close-on-click-modal="false"
       v-dialogDrag
-      width="1500px"
+      width="1300px"
       @close="close"
       @keyup.enter.native="doSubmit"
       :visible.sync="visible">
@@ -44,7 +44,7 @@
                 :url="`/sys/office/treeData?type=2`"
                 :value="inputForm.handledByOffice"
                 :accordion="true"
-                size="medium"
+                size="large"
                 @getValue="(value) => {inputForm.handledByOffice=value}"/>
             </el-form-item>
           </el-col>
@@ -53,6 +53,7 @@
               <el-date-picker
                 v-model="inputForm.wareHouseDate"
                 type="date"
+                placement="bottom-start"
                 value-format="yyyy-MM-dd"
                 style="width: 100%"
                 placeholder="选择日期">
@@ -62,7 +63,7 @@
           <el-col :span="12">
             <el-form-item label="采购编号" prop="purchaseNo"
                           :rules="[]">
-              <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
+              <el-input :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
                 <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
               </el-input>
             </el-form-item>
@@ -88,12 +89,8 @@
           </el-col>
         </el-row>
         <div v-if="commonJS.isNotEmpty(inputForm.purchaseNo)">
-          <el-divider content-position="left"><i class="el-icon-document"></i>
-            <el-link v-if="this.commonJS.isNotEmpty(this.inputForm.purchaseNo)" :underline="false" @click="viewContract(inputForm.purchaseNo)">采购详情</el-link>
-            <span v-else>采购详情</span>
-            <!--          <el-button style="margin-left: 20px" type="primary" @click="insertEvent('detail')" plain>-->
-            <!--            新增-->
-            <!--          </el-button>-->
+          <el-divider content-position="left" ><i class="el-icon-document" style="font-weight: bold;font-size: 16px;color:#409EFF"></i>
+            <el-link @click="viewContract(inputForm.purchaseNo)"><span style="font-weight: bold;font-size: 16px;color:#409EFF">&nbsp;采购详情</span></el-link>
           </el-divider>
           <el-row  :gutter="15" >
             <vxe-table
@@ -104,77 +101,22 @@
               ref="detailTable"
               class="vxe-table-element"
               :data="inputForm.detailInfos"
-              style="margin-left: 5em"
-              @cell-click=""
-              @edit-closed=""
-              highlight-current-row
-              :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
+              style="margin-left: 3em"
             >
-              <vxe-table-column field="purchaserAgent" title="采购人" :edit-render="{}" :rules="[{required: true, message:'请选择采购人', trigger:'blur'}]">
-                <template v-slot:edit="scope">
-                  <el-input :disabled='true' v-model="scope.row.purchaserAgent"></el-input>
-                  <!--                <el-input v-model="scope.row.purchaser" @focus="userPullListForm(scope.$rowIndex)"></el-input>-->
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="procurementOffice" title="采购部门" :edit-render="{}">
-                <template v-slot:edit="scope">
-                  <el-input :disabled='true' v-model="scope.row.procurementOffice" ></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="procurementType" title="采购类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
-                <template v-slot:edit="scope">
-                  <el-input :disabled='true' v-model="scope.row.procurementType"></el-input>
-                  <!--                <el-input v-model="scope.row.procurementType" @focus="typePullForm(scope.$rowIndex)"></el-input>-->
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
-                <template v-slot:edit="scope">
-                  <el-input :disabled='true' v-model="scope.row.tradeName"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
-                <template v-slot:edit="scope">
-                  <!--              <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @keyup.native="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>-->
-                  <el-input :disabled='true' @change="changeValue" maxlength="15" v-model="scope.row.tradePrice"></el-input>
-                  <!--                <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>-->
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="tradeNumber" title="商品数量" :edit-render="{}">
-                <template v-slot:edit="scope">
-                  <!--              <el-input @change="changeValue" v-model="scope.row.tradeNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>-->
-                  <el-input :disabled='true' @change="changeValue" v-model="scope.row.tradeNumber" maxlength="10"></el-input>
-                  <!--                <el-input @change="changeValue" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>-->
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="priceSum" title="商品总价" :edit-render="{}">
-                <template v-slot:edit="scope">
-                  <el-input :disabled='true' v-model="scope.row.priceSum" maxlength="15"></el-input>
-                  <!--                <el-input v-model="scope.row.priceSum" @blur="scope.row.priceSum = twoDecimalPlaces(scope.row.priceSum)" maxlength="15"></el-input>-->
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
-                <template v-slot:edit="scope">
-                  <el-input :disabled='true' v-model="scope.row.company"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="remarks" title="备注" :edit-render="{}">
-                <template v-slot:edit="scope">
-                  <el-input :disabled='true' v-model="scope.row.remarks" ></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column v-if="method === 'purchaseAdd'" title="操作" width="220">
-                <template v-slot="scope">
-                  <el-button size="mini" type="primary" :disabled="false" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
-                  <el-button size="mini" v-if="method === 'purchaseAdd'" type="primary" :disabled="false" @click="wareHouseAdd(scope.$rowIndex)">入库</el-button>
-                  <!--              <el-button size="mini" v-if="formReadOnly" :disabled="false" type="primary" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>-->
-                </template>
-              </vxe-table-column>
-              <vxe-table-column v-else title="操作" width="180">
+              <vxe-column min-width="100" align="center" field="purchaserAgent" title="采购人" ></vxe-column>
+              <vxe-column min-width="100" align="center" field="procurementOffice" title="采购部门" ></vxe-column>
+              <vxe-column min-width="100" align="center" field="procurementType" title="采购类型" ></vxe-column>
+              <vxe-column min-width="220" align="center" field="tradeName"  title="商品名称" ></vxe-column>
+              <vxe-column min-width="100" align="center" field="tradePrice" title="商品单价(元)" ></vxe-column>
+              <vxe-column min-width="80" align="center" field="tradeNumber" title="商品数量" ></vxe-column>
+              <vxe-column min-width="100" align="center" field="priceSum" title="商品总价" ></vxe-column>
+              <vxe-column min-width="100" align="center" field="company" title="单位" ></vxe-column>
+              <vxe-column min-width="100" align="center" field="remarks" title="备注" ></vxe-column>
+              <vxe-column align="center" title="操作" fixed="right" width="80">
                 <template v-slot="scope">
-                  <el-button size="mini" type="primary" :disabled="false" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
-                  <!--              <el-button size="mini" v-if="formReadOnly" :disabled="false" type="primary" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>-->
+                  <el-button size="mini" type="primary" :disabled="false" @click="seeFileInfo(scope.$rowIndex)">附件</el-button>
                 </template>
-              </vxe-table-column>
+              </vxe-column>
             </vxe-table>
           </el-row>
         </div>
@@ -185,80 +127,80 @@
             新增
           </el-button>
         </el-divider>
-        <el-row  :gutter="15" >
+        <el-row  :gutter="15">
           <vxe-table
             border
             show-footer
             show-overflow
             :footer-method="footerMethod2"
-            ref="detailTable"
+            ref="detailTableWare"
             class="vxe-table-element"
             :data="inputForm.wareHouse"
-            style="margin-left: 5em"
+            style="margin-left: 3em"
             @cell-click=""
             @edit-closed=""
             highlight-current-row
             :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
             :edit-rules="validRules"
+            :key="tableKey"
           >
-            <vxe-table-column field="wareHouseMan" title="入库人" :edit-render="{}" :rules="[{required: true, message:'请选择入库人', trigger:'blur'}]">
+            <vxe-table-column min-width="100px" align="center" field="wareHouseMan" title="入库人" :edit-render="{}" :rules="[{required: true, message:'请选择入库人', trigger:'blur'}]">
               <template v-slot:edit="scope">
                 <el-input v-model="scope.row.wareHouseMan" @focus="userPullListForm(scope.$rowIndex)"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="wareHouseManOffice" title="入库部门" :edit-render="{}">
+            <vxe-table-column min-width="100px" align="center" field="wareHouseManOffice" title="入库部门" :edit-render="{}">
               <template v-slot:edit="scope">
                 <el-input :disabled='true' v-model="scope.row.wareHouseManOffice" ></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="wareHouseType" title="入库类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
+            <vxe-table-column min-width="100px" align="center" field="wareHouseType" title="入库类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
               <template v-slot:edit="scope">
                 <el-input v-model="scope.row.wareHouseType" @focus="typePullForm(scope.$rowIndex)"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
+            <vxe-table-column min-width="180px" align="center" field="tradeName" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
               <template v-slot:edit="scope">
                 <el-input @change="ifSameValue" maxlength="64" v-model="scope.row.tradeName"></el-input>
               </template>
             </vxe-table-column>
 
-            <vxe-table-column field="tradeNumber" title="商品数量" :edit-render="{}">
+            <vxe-table-column min-width="80px" align="center" field="tradeNumber" title="商品数量" :edit-render="{}">
               <template v-slot:edit="scope">
                 <el-input @change="changeValue2" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
+            <vxe-table-column min-width="80px" align="center" field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
               <template v-slot:edit="scope">
                 <el-input maxlength="64" v-model="scope.row.company"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
+            <vxe-table-column min-width="80px" align="center" field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
               <template v-slot:edit="scope">
                 <el-input @change="changeValue2" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces2(scope.row.tradePrice)"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="priceSum" title="商品总价" :edit-render="{}">
+            <vxe-table-column min-width="80px" align="center" field="priceSum" title="商品总价" :edit-render="{}">
               <template v-slot:edit="scope">
                 <el-input :disabled='true' v-model="scope.row.priceSum" @blur="scope.row.priceSum = twoDecimalPlaces(scope.row.priceSum)" maxlength="15"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="actualPrice" title="实际价格" :edit-render="{}">
+            <vxe-table-column min-width="80px" align="center" field="actualPrice" title="实际价格" :edit-render="{}">
               <template v-slot:edit="scope">
                 <el-input v-model="scope.row.actualPrice" @blur="scope.row.actualPrice = twoDecimalPlaces(scope.row.actualPrice)" maxlength="15"></el-input>
               </template>
             </vxe-table-column>
 
-            <vxe-table-column field="remarks" title="备注" :edit-render="{}">
+            <vxe-table-column min-width="80px" align="center" field="remarks" title="备注" :edit-render="{}">
               <template v-slot:edit="scope">
                 <el-input maxlength="255" v-model="scope.row.remarks" ></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column title="操作" width="180">
+            <vxe-table-column align="center" fixed="right" title="操作" width="220px">
               <template v-slot="scope">
-                <el-button size="mini" type="danger" v-if="method!=='view'" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
-                <el-button size="mini" type="primary" v-if="method!=='view'" @click="sss2(scope.$rowIndex)">上传附件</el-button>
-                <el-button size="mini" type="primary" v-if="method==='view'" :disabled="false" @click="seeFileInfo2(scope.$rowIndex)">查看文件详情</el-button>
-                <!--              <el-button size="mini" v-if="formReadOnly" :disabled="false" type="primary" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>-->
+                <el-button size="mini" type="primary" v-if="method === 'view'" :disabled="false" @click="seeFileInfo2(scope.$rowIndex)">查看附件</el-button>
+                <el-button size="mini" type="primary" v-if="method !== 'view'" @click="sss2(scope.$rowIndex)">上传附件</el-button>
+                <el-button size="mini" type="danger" v-if="method !== 'view'" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
               </template>
             </vxe-table-column>
           </vxe-table>
@@ -340,7 +282,8 @@
           wareHouse: [],
           // amountInfos: [],
           files: [] // 附件信息
-        }
+        },
+        tableKey: ''
       }
     },
     MaterialManagementService: null,
@@ -446,6 +389,7 @@
               }
               this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
               this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+              this.tableKey = Math.random()
               this.loading = false
             })
           } else {
@@ -764,7 +708,7 @@
       // 删除
       removeEvent (row, rowIndex, type) {
         if (type === 'detail') {
-          this.$refs.detailTable.remove(row)
+          this.$refs.detailTableWare.remove(row)
           // this.inputForm.detailInfos.splice(rowIndex, 1)
           this.inputForm.wareHouse.splice(rowIndex, 1)
         }
@@ -776,7 +720,7 @@
       // 新增
       async insertEvent (type) {
         if (type === 'detail') {
-          await this.$refs.detailTable.insert().then((data) => {
+          await this.$refs.detailTableWare.insert().then((data) => {
             data.wareHouseManId = this.wareHouseManId
             data.wareHouseMan = this.name
             data.wareHouseManOffice = this.officeName

src/views/modules/materialManagement/wareHouse/WareHouseHi.vue

@@ -0,0 +1,507 @@
+<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
+  <div>
+    <el-dialog
+      :title="title"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      append-to-body
+      width="1200px"
+      @close="close"
+      @keyup.enter.native="doSubmit"
+      :visible.sync="visible">
+    <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="true"
+             label-width="100px" @submit.native.prevent>
+      <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
+      <el-row :gutter="26">
+        <el-col :span="12">
+          <el-form-item label="入库编号" prop="wareHouseNumber">
+            <el-input placeholder="自动生成" v-model="inputForm.wareHouseNumber" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="入库名称" prop="wareHouseName"
+                        :rules="[{required: true, message: '入库名称不能为空', trigger: 'blur'}
+                 ]">
+            <el-input v-model="inputForm.wareHouseName" placeholder="请填写入库名称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="经办人" prop="handledBy">
+            <el-input v-model="inputForm.handledBy" :disabled="true"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="经办人部门" prop="handledByOffice">
+            <SelectTree
+              :disabled="true"
+              ref="officeTree"
+              :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+
+              :url="`/sys/office/treeData?type=2`"
+              :value="inputForm.handledByOffice"
+              :accordion="true"
+              size="large"
+              @getValue="(value) => {inputForm.handledByOffice=value}"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="入库时间" prop="wareHouseDate" :rules="[{required: true, message:'请选择入库时间', trigger:'blur'}]">
+            <el-date-picker
+              v-model="inputForm.wareHouseDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              style="width: 100%"
+              placement="bottom-start"
+              placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采购编号" prop="purchaseNo"
+                        :rules="[]">
+            <el-input :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
+              <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remarks">
+            <el-input v-model="inputForm.remarks"
+                      type="textarea"
+                      :rows="5"
+                      maxlength="500"
+                      placeholder="请输入简介"
+                      show-word-limit>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <div v-if="commonJS.isNotEmpty(inputForm.purchaseNo)">
+        <el-divider content-position="left" ><i class="el-icon-document" style="font-weight: bold;font-size: 16px;color:#409EFF"></i>
+          <el-link @click="viewContract(inputForm.purchaseNo)"><span style="font-weight: bold;font-size: 16px;color:#409EFF">&nbsp;采购详情</span></el-link>
+        </el-divider>
+        <el-row  :gutter="15" >
+          <vxe-table
+            border
+            show-footer
+            show-overflow
+            :footer-method="footerMethod"
+            ref="detailTable"
+            class="vxe-table-element"
+            :data="inputForm.detailInfos"
+            style="margin-left: 3em"
+          >
+            <vxe-column min-width="100" align="center" field="purchaserAgent" title="采购人" ></vxe-column>
+            <vxe-column min-width="100" align="center" field="procurementOffice" title="采购部门" ></vxe-column>
+            <vxe-column min-width="100" align="center" field="procurementType" title="采购类型" ></vxe-column>
+            <vxe-column min-width="220" align="center" field="tradeName"  title="商品名称" ></vxe-column>
+            <vxe-column min-width="100" align="center" field="tradePrice" title="商品单价(元)" ></vxe-column>
+            <vxe-column min-width="80" align="center" field="tradeNumber" title="商品数量" ></vxe-column>
+            <vxe-column min-width="100" align="center" field="priceSum" title="商品总价" ></vxe-column>
+            <vxe-column min-width="100" align="center" field="company" title="单位" ></vxe-column>
+            <vxe-column min-width="100" align="center" field="remarks" title="备注" ></vxe-column>
+            <vxe-column align="center" title="操作" fixed="right" width="80">
+              <template v-slot="scope">
+                <el-button size="mini" type="primary" :disabled="false" @click="seeFileInfo(scope.$rowIndex)"plain>附件</el-button>
+              </template>
+            </vxe-column>
+          </vxe-table>
+        </el-row>
+      </div>
+
+      <el-divider content-position="left"><i class="el-icon-document"></i>
+        入库详情
+      </el-divider>
+      <el-row :gutter="15" >
+        <vxe-table
+          border
+          show-footer
+          show-overflow
+          :footer-method="footerMethod2"
+          ref="detailTableWare"
+          class="vxe-table-element"
+          :data="inputForm.wareHouse"
+          style="margin-left: 3em"
+          :row-class-name="rowClassName"
+          :key="tableKey"
+        >
+          <vxe-column min-width="100px" align="center" field="wareHouseMan" title="入库人">
+            <template v-slot="scope">
+              <span v-if="scope.row.upFlag === '1'"> {{scope.row.wareHouseMan}}(修改前) </span>
+              <span v-else-if="scope.row.upFlag === '2'"> {{scope.row.wareHouseMan}}(已删除) </span>
+              <span v-else-if="scope.row.upFlag === '0' && commonJS.isNotEmpty(scope.row.sourceId)"> {{scope.row.wareHouseMan}}(修改后) </span>
+              <span v-else-if="scope.row.upFlag === '0' && commonJS.isEmpty(scope.row.sourceId)"> {{scope.row.wareHouseMan}} </span>
+            </template>
+          </vxe-column>
+          <vxe-column min-width="100px" align="center" field="wareHouseManOffice" title="入库部门"></vxe-column>
+          <vxe-column min-width="100px" align="center" field="wareHouseType" title="入库类型"></vxe-column>
+          <vxe-column min-width="180px" align="center" field="tradeName" title="商品名称" ></vxe-column>
+          <vxe-column min-width="80px" align="center" field="tradeNumber" title="商品数量" ></vxe-column>
+          <vxe-column min-width="80px" align="center" field="company" title="单位"></vxe-column>
+          <vxe-column min-width="80px" align="center" field="tradePrice" title="商品单价(元)" ></vxe-column>
+          <vxe-column min-width="80px" align="center" field="priceSum" title="商品总价"></vxe-column>
+          <vxe-column min-width="80px" align="center" field="actualPrice" title="实际价格"></vxe-column>
+          <vxe-column min-width="110px" align="center" field="remarks" title="备注"></vxe-column>
+          <vxe-column align="center" fixed="right" title="操作" width="80px">
+            <template v-slot="scope">
+              <el-button size="mini" type="primary" v-if="scope.row.upFlag !== '1'" :disabled="false" @click="seeFileInfo2(scope.$rowIndex)" plain>附件</el-button>
+            </template>
+          </vxe-column>
+        </vxe-table>
+      </el-row>
+      <el-row>
+        <el-col :span="24" style="margin-top: 20px">
+          <el-form-item label="修改原因" prop="updateCause" :rules="[{required: true, message: '修改原因不能为空', trigger: 'blur'}]">
+            <el-input type="textarea"
+                      :rows="5"
+                      maxlength="500"
+                      placeholder="请填写修改原因"
+                      show-word-limit
+                      v-model="inputForm.updateCause"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <!-- 附件 -->
+    <MaterialManagementDialog ref="materialManagementDialog" @getUpload="getUpload"></MaterialManagementDialog>
+    <UpdateInfoForm ref="updateInfoForm"></UpdateInfoForm>
+    <PurchaseChooseForm  ref="purchaseChooseForm" @getProject="getContract"></PurchaseChooseForm>
+    <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
+    <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
+    <MaterialTypePullForm ref="materialTypePullForm" @getProgramForType="getProgramForType"></MaterialTypePullForm>
+    <UserPullForm ref="userPullForm" @getProgramForUser="getProgramForUser"></UserPullForm>
+      <span slot="footer" class="dialog-footer">
+      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+    </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import MaterialManagementDialog from '../file/MaterialManagementDialog'
+  import WareHouseService from '@/api/materialManagement/WareHouseService'
+  import UpdateInfoForm from '../info/UpdateInfoForm'
+  import PurchaseChooseForm from './PurchaseChooseForm'
+
+  import UserSelect from '@/components/userSelect'
+  import CommonApi from '@/api/cw/common/CommonApi'
+  import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
+  import UpLoadComponent from '@/views/common/UpLoadComponent'
+  import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import SelectTree from '@/components/treeSelect/treeSelect.vue'
+  import XEUtils from 'xe-utils'
+  import UserService from '@/api/sys/UserService'
+  import CwProgramPageForm from '@/views/modules/cw/reimbursementApproval/info/CwProgramPageForm'
+  import MaterialTypePullForm from '../info/MaterialTypePullForm'
+  import UserPullForm from '@/views/modules/finance/invoice/UserPullForm'
+  import ContractChooseForm from '../contract/ContractChooseForm'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        indexRow: '',
+        inputForm: {
+          procInsId: '',
+          wareHouseTotalPrice: '', // 入库商品总价
+          wareHouseActualPrice: '', // 入库商品实际价格
+          tradeTotalPrice: '',  // 商品总价
+          fileInfoLost: [],
+          purchaseNo: '',
+          handledBy: '',
+          handledById: '',
+          handledByOffice: '',
+          wareHouseName: '',
+          wareHouseNumber: '', // 入库编号
+          userId: '',
+          wareHouseDate: '',
+          remarks: '',
+          detailInfos: [],
+          wareHouse: [],
+          // amountInfos: [],
+          files: [], // 附件信息
+          functionFlag: ''
+        },
+        keyWatch: '',
+        tableKey: ''
+      }
+    },
+    wareHouseService: null,
+    MaterialManagementService: null,
+    userService: null,
+    commonApi: null,
+    created () {
+      this.materialManagementService = new MaterialManagementService()
+      this.userService = new UserService()
+      this.commonApi = new CommonApi()
+      this.wareHouseService = new WareHouseService()
+    },
+    props: {},
+    components: {
+      MaterialManagementDialog,
+      PurchaseChooseForm,
+      UserSelect,
+      UpLoadComponent,
+      SelectUserTree,
+      SelectTree,
+      CwProgramPageForm,
+      MaterialTypePullForm,
+      UserPullForm,
+      ContractChooseForm,
+      UpdateInfoForm
+    },
+    computed: {},
+    watch: {
+      'loading': {
+        handler (newVal) {
+          this.$refs.uploadComponent.changeLoading(newVal)
+        }
+      }
+    },
+    methods: {
+      init (id) {
+        this.inputForm = {
+          procInsId: '',
+          wareHouseTotalPrice: '', // 入库商品总价
+          wareHouseActualPrice: '', // 入库商品实际价格
+          tradeTotalPrice: '',  // 商品总价
+          fileInfoLost: [],
+          purchaseNo: '',
+          handledBy: JSON.parse(localStorage.getItem('user')).name,
+          handledById: JSON.parse(localStorage.getItem('user')).id,
+          handledByOffice: JSON.parse(localStorage.getItem('user')).officeDTO.id,
+          wareHouseName: '',
+          wareHouseNumber: '', // 入库编号
+          userId: JSON.parse(localStorage.getItem('user')).id,
+          wareHouseDate: new Date(),
+          remarks: '',
+          detailInfos: [],
+          wareHouse: [],
+          // amountInfos: [],
+          files: [], // 附件信息
+          functionFlag: ''
+        }
+        this.title = '入库修改历史详情'
+        this.inputForm.id = id
+        this.visible = true
+        this.loading = false
+        this.$nextTick(() => {
+          this.loading = true
+          this.$refs.inputForm.resetFields()
+          this.wareHouseService.findHiByHiId(this.inputForm.id, this.status).then(({data}) => {
+            this.$refs.uploadComponent.clearUpload()
+            if (this.commonJS.isNotEmpty(data.wareHouseManId)) {
+              this.wareHouseManId = data.wareHouseManId
+            }
+            if (this.commonJS.isNotEmpty(data.wareHouseTypeId)) {
+              this.wareHouseTypeId = data.wareHouseTypeId
+            }
+            this.inputForm = this.recover(this.inputForm, data)
+            this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+            if (this.commonJS.isNotEmpty(this.inputForm.detailInfos)) {
+              let i = this.inputForm.detailInfos.length
+              for (let j = 0; j < i; j++) {
+                if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+                  if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
+                    this.inputForm.detailInfos[j].priceSum = this.inputForm.detailInfos[j].tradePrice * this.inputForm.detailInfos[j].tradeNumber
+                  }
+                }
+              }
+            }
+            if (this.commonJS.isNotEmpty(this.inputForm.wareHouse)) {
+              let k = this.inputForm.wareHouse.length
+              for (let j = 0; j < k; j++) {
+                if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradePrice)) {
+                  if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradeNumber)) {
+                    this.inputForm.wareHouse[j].priceSum = this.inputForm.wareHouse[j].tradePrice * this.inputForm.wareHouse[j].tradeNumber
+                  }
+                }
+              }
+            }
+            this.$refs.uploadComponent.newUpload('view', this.inputForm.files, 'wareHouse')
+            this.loading = false
+            this.tableKey = Math.random()
+          })
+        })
+      },
+      getUpload (p, index) {
+        p.then((list) => {
+          // list为返回数据
+          this.inputForm.wareHouse[index].fileInfoLost = list
+          this.inputForm.wareHouse[index].fileNumber = list.length
+          this.tableKeyClient = Math.random()
+        })
+      },
+      close () {
+        this.inputForm = {
+          procInsId: '',
+          wareHouseTotalPrice: '',
+          wareHouseActualPrice: '',
+          tradeTotalPrice: '',
+          fileInfoLost: [],
+          purchaseNo: '',
+          handledBy: '',
+          handledById: '',
+          handledByOffice: '',
+          wareHouseName: '',
+          wareHouseNumber: '',
+          userId: '',
+          wareHouseDate: '',
+          remarks: '',
+          detailInfos: [],
+          wareHouse: [],
+          files: [],
+          functionFlag: ''
+        }
+        this.method = ''
+        this.inputForm.functionFlag = ''
+        this.inputForm.detailInfos = []
+        this.inputForm.wareHouse = []
+        this.inputForm.amountInfos = []
+        this.$refs.uploadComponent.clearUpload()
+        this.$refs.inputForm.resetFields()
+        this.visible = false
+      },
+      getProgram (rows) {
+        this.inputForm.detailInfos[this.indexRow].projectId = rows[0].id
+        this.inputForm.detailInfos[this.indexRow].projectName = rows[0].name
+        this.inputForm.detailInfos[this.indexRow].reportNumber = rows[0].reportNo
+        this.indexRow = ''
+        this.$forceUpdate()
+      },
+      getProgramForType (rows) {
+        this.inputForm.wareHouse[this.indexRow].wareHouseTypeId = rows.id
+        this.inputForm.wareHouse[this.indexRow].wareHouseType = rows.name
+        // this.inputForm.detailInfos[this.indexRow].procurementType = rows.name
+        this.indexRow = ''
+        this.$forceUpdate()
+      },
+      getProgramForUser (rows) {
+        this.inputForm.wareHouse[this.indexRow].wareHouseManId = rows[0].id
+        this.inputForm.wareHouse[this.indexRow].wareHouseMan = rows[0].name
+        this.inputForm.wareHouse[this.indexRow].deptId = rows[0].parentId
+        this.inputForm.wareHouse[this.indexRow].wareHouseManOffice = rows[0].officeName
+        this.indexRow = ''
+        this.$forceUpdate()
+      },
+      openContractForm () {
+        this.$refs.purchaseChooseForm.init()
+      },
+      getContract (row) {
+        this.materialManagementService.findById(row.id).then(({data}) => {
+          this.inputForm.detailInfos = data.detailInfos
+          this.inputForm.purchaseNo = data.purchaseNo
+          let i = this.inputForm.detailInfos.length
+          for (let j = 0; j < i; j++) {
+            if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+              if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
+                this.inputForm.detailInfos[j].priceSum = this.inputForm.detailInfos[j].tradePrice * this.inputForm.detailInfos[j].tradeNumber
+              }
+            }
+          }
+        })
+        this.$forceUpdate()
+      },
+      // 查看采购详情
+      async viewContract (purchaseNo) {
+        this.wareHouseService.findRequestId(purchaseNo).then(({data}) => {
+          this.$refs.updateInfoForm.init('view', data)
+        }).catch(() => {
+        })
+      },
+      footerMethod ({ columns, data }) {
+        const footerData = [
+          columns.map((column, columnIndex) => {
+            if (columnIndex === 0) {
+              return '商品总价'
+            }
+            if (['priceSum'].includes(column.property)) {
+              // eslint-disable-next-line no-undef
+              this.inputForm.tradeTotalPrice = XEUtils.sum(data, column.property)
+              return XEUtils.sum(data, column.property)
+            }
+            return null
+          })
+        ]
+        return footerData
+      },
+      footerMethod2 ({ columns, data }) {
+        const footerData = [
+          columns.map((column, columnIndex) => {
+            if (columnIndex === 0) {
+              return '商品总价'
+            }
+            if (['priceSum'].includes(column.property)) {
+              // eslint-disable-next-line no-undef
+              this.inputForm.wareHouseTotalPrice = XEUtils.sum(data, column.property)
+              return XEUtils.sum(data, column.property)
+            }
+            if (['actualPrice'].includes(column.property)) {
+              // eslint-disable-next-line no-undef
+              this.inputForm.wareHouseActualPrice = XEUtils.sum(data, column.property)
+              return XEUtils.sum(data, column.property)
+            }
+            return null
+          })
+        ]
+        return footerData
+      },
+      seeFileInfo (index) {
+        if (this.commonJS.isEmpty(this.inputForm.detailInfos[index].fileInfoLost)) {
+          this.inputForm.detailInfos[index].fileInfoLost = []
+        }
+        this.$refs.materialManagementDialog.newUpload('view', this.inputForm.detailInfos[index].fileInfoLost, null, null, null, null, null, false, index)
+      },
+      seeFileInfo2 (index) {
+        if (this.commonJS.isEmpty(this.inputForm.wareHouse[index].fileInfoLost)) {
+          this.inputForm.wareHouse[index].fileInfoLost = []
+        }
+        this.$refs.materialManagementDialog.newUpload('view', this.inputForm.wareHouse[index].fileInfoLost, null, null, null, null, null, false, index)
+      },
+      // 采购类型下拉弹窗
+      typePullForm (rowIndex) {
+        this.indexRow = rowIndex
+        this.$refs.materialTypePullForm.init()
+      },
+      // 列表行颜色
+      rowClassName ({ row, rowIndex }) {
+        if (row.upFlag === '1') { // 修改前
+          return 'row-grey'
+        } else if (row.upFlag === '2') { // 已删除
+          return 'row-red'
+        } else if (row.upFlag === '0' && this.commonJS.isNotEmpty(row.sourceId)) { // 修改后
+          return 'row-green'
+        } else if (row.upFlag === '0' && this.commonJS.isEmpty(row.sourceId)) { // 未被修改过的数据
+          return ''
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+  .el-divider__text {
+    font-size: 16px;
+    font-weight: bold;
+  }
+  /deep/  .row-green {
+    /*background-color: #67c23ad1;*/
+    /*color: #fff;*/
+    font-weight: bold;
+  }
+  /deep/  .row-grey {
+    background-color: #b8b7b7;
+    color: #fff;
+  }
+  /deep/  .row-red {
+    background-color: #f56c6c66;
+    /*color: #fff;*/
+    font-weight: bold;
+  }
+</style>

src/views/modules/materialManagement/wareHouse/WareHouseList.vue

@@ -91,14 +91,14 @@
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
-          <vxe-column min-width="160" align="center" title="入库编号" field="wareHouseNumber"></vxe-column>
-          <vxe-column min-width="160" align="center" title="入库名称" field="wareHouseName">
+          <vxe-column min-width="160" align="center" title="入库编号" field="wareHouseNumber">
             <template slot-scope="scope">
-              <el-link  type="primary" :underline="false" v-if="hasPermission('material:list')" @click="view(scope.row.id)">{{scope.row.wareHouseName}}</el-link>
-              <el-link  type="primary" :underline="false" v-else-if="hasPermission('material:list')"  @click="view(scope.row.id,)">{{scope.row.wareHouseName}}</el-link>
-              <span v-else>{{scope.row.wareHouseName}}</span>
+              <el-link  type="primary" :underline="false" v-if="hasPermission('material:list')" @click="view(scope.row.id)">{{scope.row.wareHouseNumber}}</el-link>
+              <el-link  type="primary" :underline="false" v-else-if="hasPermission('material:list')"  @click="view(scope.row.id,)">{{scope.row.wareHouseNumber}}</el-link>
+              <span v-else>{{scope.row.wareHouseNumber}}</span>
             </template>
           </vxe-column>
+          <vxe-column min-width="160" align="center" title="入库名称" field="wareHouseName"></vxe-column>
           <vxe-column min-width="160" align="center" title="入库时间" field="wareHouseDate"></vxe-column>
           <vxe-column min-width="160" align="center" title="经办人" field="handleByName"></vxe-column>
           <vxe-column min-width="160" align="center" title="经办人部门" field="handledByOfficeName"></vxe-column>
@@ -123,7 +123,7 @@
               <!--              当前申请人撤回后->申请修改-->
               <el-button v-if="hasPermission('material:wareHouse:edit')&&scope.row.createBy === $store.state.user.id&&(scope.row.status==='3'||scope.row.status==='1')" type="text"  size="small" @click="push(scope.row)">申请修改</el-button>
               <!--              当前申请人撤回后->取消修改申请-->
-<!--              <el-button v-if="hasPermission('material:edit:edit')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='3'" type="text"  size="small" @click="stopUpdate(scope.row.id)">取消修改</el-button>-->
+              <el-button v-if="hasPermission('material:wareHouse:edit')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='3'" type="text"  size="small" @click="stopUpdate(scope.row.id)">取消修改</el-button>
               <el-button v-if="scope.row.status==='2' && checkIsAudit(scope.row)" type="text"  size="small" @click="examine(scope.row)">审核</el-button>
               <el-button v-if="hasPermission('material:wareHouse:edit')&&scope.row.status === '4'&&scope.row.createBy === $store.state.user.id" type="text"  size="small" @click="adjust(scope.row)">驳回调整</el-button>
             </template>
@@ -367,7 +367,8 @@ export default {
                     businessId: row.id,
                     isShow: 'false',
                     status: status,
-                    routePath: '/materialManagement/wareHouse/WareHouseList'
+                    routePath: '/materialManagement/wareHouse/WareHouseList',
+                    wareHouseId: row.id
                   }
                 })
               })
@@ -391,7 +392,8 @@ export default {
                 title: '入库修改' + '流程详情',
                 formTitle: '入库修改' + '流程详情',
                 businessId: row.id,
-                status: 'reback'
+                status: 'reback',
+                wareHouseId: row.id
               }
             })
           })
@@ -419,6 +421,31 @@ export default {
           })
         })
       },
+      stopUpdate (id) {
+        this.wareHouseService.findById(id).then(({data}) => {
+          if (data.status !== '3') { // status的值不等于“撤回”，就弹出提示
+            this.$message.error('数据已发生改变或不存在，请刷新数据')
+            this.refreshList()
+          } else {
+            this.$confirm(`确定要取消修改申请吗?`, '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.wareHouseService.backSourceData(id).then(({data}) => {
+                if (data.result === 'success') {
+                  this.$message.success('取消修改申请成功')
+                } else {
+                  this.$message.error('取消修改申请失败')
+                }
+                this.refreshList()
+              }).catch(() => {
+                this.refreshList()
+              })
+            })
+          }
+        })
+      },
       // 驳回后调整
       adjust (row) {
         this.wareHouseService.findById(row.id).then(({data}) => {
@@ -456,7 +483,8 @@ export default {
               formTitle: `${data.taskName}`,
               cUser: cUser,
               title: `审批【${data.taskName || ''}】`,
-              routePath: '/materialManagement/wareHouse/WareHouseList'   // 数据处理后需要跳转的页面路径
+              routePath: '/materialManagement/wareHouse/WareHouseList',   // 数据处理后需要跳转的页面路径
+              wareHouseId: row.id
             }
           })
         })

src/views/modules/materialManagement/wareHouse/WareHouseUpdateForm.vue

@@ -1,6 +1,6 @@
-<template>
+<template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
   <div>
-    <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="formReadOnly"
+    <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'"
              label-width="100px" @submit.native.prevent>
       <el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
       <el-row :gutter="26">
@@ -35,7 +35,7 @@
               :url="`/sys/office/treeData?type=2`"
               :value="inputForm.handledByOffice"
               :accordion="true"
-              size="medium"
+              size="large"
               @getValue="(value) => {inputForm.handledByOffice=value}"/>
           </el-form-item>
         </el-col>
@@ -46,6 +46,7 @@
               type="date"
               value-format="yyyy-MM-dd"
               style="width: 100%"
+              placement="bottom-start"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -53,19 +54,11 @@
         <el-col :span="12">
           <el-form-item label="采购编号" prop="purchaseNo"
                         :rules="[]">
-            <el-input size="medium" :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
+            <el-input :readonly="true" @focus="openContractForm()" v-model="inputForm.purchaseNo" placeholder="请选择采购编号">
               <el-button slot="append" icon="el-icon-search" @click="openContractForm()"></el-button>
             </el-input>
           </el-form-item>
         </el-col>
-        <!--<el-col :span="12">
-          <el-form-item label="合同编号" prop="contractNo"
-                        :rules="[]">
-            <el-input size="medium" :readonly="true" @focus="openContractChooseForm()" v-model="inputForm.contractNo" placeholder="请选择采购编号">
-              <el-button slot="append" icon="el-icon-search" @click="openContractChooseForm()"></el-button>
-            </el-input>
-          </el-form-item>
-        </el-col>-->
         <el-col :span="24">
           <el-form-item label="备注" prop="remarks">
             <el-input v-model="inputForm.remarks"
@@ -80,9 +73,8 @@
       </el-row>
 
       <div v-if="commonJS.isNotEmpty(inputForm.purchaseNo)">
-        <el-divider content-position="left"><i class="el-icon-document"></i>
-          <el-link v-if="this.commonJS.isNotEmpty(this.inputForm.purchaseNo)" :underline="false" @click="viewContract(inputForm.purchaseNo)">采购详情</el-link>
-          <span v-else>采购详情</span>
+        <el-divider content-position="left" ><i class="el-icon-document" style="font-weight: bold;font-size: 16px;color:#409EFF"></i>
+          <el-link @click="viewContract(inputForm.purchaseNo)"><span style="font-weight: bold;font-size: 16px;color:#409EFF">&nbsp;采购详情</span></el-link>
         </el-divider>
         <el-row  :gutter="15" >
           <vxe-table
@@ -93,155 +85,155 @@
             ref="detailTable"
             class="vxe-table-element"
             :data="inputForm.detailInfos"
-            style="margin-left: 5em"
-            @cell-click=""
-            @edit-closed=""
-            highlight-current-row
-            :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
+            style="margin-left: 3em"
           >
-            <vxe-table-column field="purchaserAgent" title="采购人" :edit-render="{}" :rules="[{required: true, message:'请选择采购人', trigger:'blur'}]">
-              <template v-slot:edit="scope">
-                <el-input :disabled='true' v-model="scope.row.purchaserAgent"></el-input>
-                <!--                <el-input v-model="scope.row.purchaser" @focus="userPullListForm(scope.$rowIndex)"></el-input>-->
-              </template>
-            </vxe-table-column>
-            <vxe-table-column field="procurementOffice" title="采购部门" :edit-render="{}">
-              <template v-slot:edit="scope">
-                <el-input :disabled='true' v-model="scope.row.procurementOffice" ></el-input>
-              </template>
-            </vxe-table-column>
-            <vxe-table-column field="procurementType" title="采购类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
-              <template v-slot:edit="scope">
-                <el-input :disabled='true' v-model="scope.row.procurementType"></el-input>
-                <!--                <el-input v-model="scope.row.procurementType" @focus="typePullForm(scope.$rowIndex)"></el-input>-->
-              </template>
-            </vxe-table-column>
-            <vxe-table-column field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
-              <template v-slot:edit="scope">
-                <el-input :disabled='true' v-model="scope.row.tradeName"></el-input>
-              </template>
-            </vxe-table-column>
-            <vxe-table-column field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
-              <template v-slot:edit="scope">
-                <!--              <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @keyup.native="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>-->
-                <el-input :disabled='true' @change="changeValue" maxlength="15" v-model="scope.row.tradePrice"></el-input>
-                <!--                <el-input @change="changeValue" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces(scope.row.tradePrice)"></el-input>-->
-              </template>
-            </vxe-table-column>
-            <vxe-table-column field="tradeNumber" title="商品数量" :edit-render="{}">
-              <template v-slot:edit="scope">
-                <!--              <el-input @change="changeValue" v-model="scope.row.tradeNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>-->
-                <el-input :disabled='true' @change="changeValue" v-model="scope.row.tradeNumber" maxlength="10"></el-input>
-                <!--                <el-input @change="changeValue" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>-->
-              </template>
-            </vxe-table-column>
-            <vxe-table-column field="priceSum" title="商品总价" :edit-render="{}">
-              <template v-slot:edit="scope">
-                <el-input :disabled='true' v-model="scope.row.priceSum" maxlength="15"></el-input>
-              </template>
-            </vxe-table-column>
-            <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
-              <template v-slot:edit="scope">
-                <el-input :disabled='true' v-model="scope.row.company"></el-input>
-              </template>
-            </vxe-table-column>
-            <vxe-table-column field="remarks" title="备注" :edit-render="{}">
-              <template v-slot:edit="scope">
-                <el-input :disabled='true' v-model="scope.row.remarks" ></el-input>
-              </template>
-            </vxe-table-column>
-            <vxe-table-column title="操作" width="180">
+            <vxe-column min-width="100" align="center" field="purchaserAgent" title="采购人" ></vxe-column>
+            <vxe-column min-width="100" align="center" field="procurementOffice" title="采购部门" ></vxe-column>
+            <vxe-column min-width="100" align="center" field="procurementType" title="采购类型" ></vxe-column>
+            <vxe-column min-width="220" align="center" field="tradeName"  title="商品名称" ></vxe-column>
+            <vxe-column min-width="100" align="center" field="tradePrice" title="商品单价(元)" ></vxe-column>
+            <vxe-column min-width="80" align="center" field="tradeNumber" title="商品数量" ></vxe-column>
+            <vxe-column min-width="100" align="center" field="priceSum" title="商品总价" ></vxe-column>
+            <vxe-column min-width="100" align="center" field="company" title="单位" ></vxe-column>
+            <vxe-column min-width="100" align="center" field="remarks" title="备注" ></vxe-column>
+            <vxe-column align="center" title="操作" fixed="right" width="80">
               <template v-slot="scope">
-                <el-button size="mini" type="primary" :disabled="false" @click="seeFileInfo(scope.$rowIndex)">查看文件详情</el-button>
+                <el-button size="mini" type="primary" :disabled="false" @click="seeFileInfo(scope.$rowIndex)" plain>附件</el-button>
               </template>
-            </vxe-table-column>
+            </vxe-column>
           </vxe-table>
         </el-row>
       </div>
 
       <el-divider content-position="left"><i class="el-icon-document"></i>
         入库详情
-<!--        <el-button style="margin-left: 20px" type="primary" @click="insertEvent('detail')" plain>-->
-<!--          新增-->
-<!--        </el-button>-->
       </el-divider>
-      <el-row  :gutter="15" >
+      <el-row v-if="status === 'audit' || status === 'taskFormDetail'" :gutter="15" >
         <vxe-table
           border
           show-footer
           show-overflow
           :footer-method="footerMethod2"
-          ref="detailTable"
+          ref="detailTableWare"
           class="vxe-table-element"
           :data="inputForm.wareHouse"
-          style="margin-left: 5em"
+          style="margin-left: 3em"
+          :row-class-name="rowClassName"
+          :key="tableKey"
+        >
+          <vxe-column min-width="100px" align="center" field="wareHouseMan" title="入库人">
+            <template v-slot="scope">
+              <span v-if="scope.row.upFlag === '1'"> {{scope.row.wareHouseMan}}(修改前) </span>
+              <span v-else-if="scope.row.upFlag === '2'"> {{scope.row.wareHouseMan}}(已删除) </span>
+              <span v-else-if="scope.row.upFlag === '0' && commonJS.isNotEmpty(scope.row.sourceId)"> {{scope.row.wareHouseMan}}(修改后) </span>
+              <span v-else-if="scope.row.upFlag === '0' && commonJS.isEmpty(scope.row.sourceId)"> {{scope.row.wareHouseMan}} </span>
+            </template>
+          </vxe-column>
+          <vxe-column min-width="100px" align="center" field="wareHouseManOffice" title="入库部门"></vxe-column>
+          <vxe-column min-width="100px" align="center" field="wareHouseType" title="入库类型"></vxe-column>
+          <vxe-column min-width="180px" align="center" field="tradeName" title="商品名称" ></vxe-column>
+          <vxe-column min-width="80px" align="center" field="tradeNumber" title="商品数量" ></vxe-column>
+          <vxe-column min-width="80px" align="center" field="company" title="单位"></vxe-column>
+          <vxe-column min-width="80px" align="center" field="tradePrice" title="商品单价(元)" ></vxe-column>
+          <vxe-column min-width="80px" align="center" field="priceSum" title="商品总价"></vxe-column>
+          <vxe-column min-width="80px" align="center" field="actualPrice" title="实际价格"></vxe-column>
+          <vxe-column min-width="110px" align="center" field="remarks" title="备注"></vxe-column>
+          <vxe-column align="center" fixed="right" title="操作" width="80px">
+            <template v-slot="scope">
+              <el-button size="mini" type="primary" v-if="scope.row.upFlag !== '1'" :disabled="false" @click="seeFileInfo2(scope.$rowIndex)" plain>附件</el-button>
+            </template>
+          </vxe-column>
+        </vxe-table>
+      </el-row>
+      <el-row  :gutter="15" v-else>
+        <vxe-table
+          border
+          show-footer
+          show-overflow
+          :footer-method="footerMethod2"
+          ref="detailTableWare"
+          class="vxe-table-element"
+          :data="inputForm.wareHouse"
+          style="margin-left: 3em"
           @cell-click=""
           @edit-closed=""
           highlight-current-row
           :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '-'}"
           :edit-rules="validRules"
         >
-          <vxe-table-column align="center" field="wareHouseMan" title="入库人" :edit-render="{}" :rules="[{required: true, message:'请选择入库人', trigger:'blur'}]">
+          <vxe-table-column min-width="100px" align="center" field="wareHouseMan" title="入库人" :edit-render="{}" :rules="[{required: true, message:'请选择入库人', trigger:'blur'}]">
             <template v-slot:edit="scope">
               <el-input v-model="scope.row.wareHouseMan" @focus="userPullListForm(scope.$rowIndex)"></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column align="center" field="wareHouseManOffice" title="入库部门" :edit-render="{}">
+          <vxe-table-column min-width="100px" align="center" field="wareHouseManOffice" title="入库部门" :edit-render="{}">
             <template v-slot:edit="scope">
               <el-input :disabled='true' v-model="scope.row.wareHouseManOffice" ></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column align="center" field="wareHouseType" title="入库类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
+          <vxe-table-column min-width="100px" align="center" field="wareHouseType" title="入库类型" :edit-render="{}" :rules="[{required: true, message:'请选择采购类型', trigger:'blur'}]">
             <template v-slot:edit="scope">
               <el-input v-model="scope.row.wareHouseType" @focus="typePullForm(scope.$rowIndex)"></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column align="center" field="tradeName" width="250" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
+          <vxe-table-column min-width="180px" align="center" field="tradeName" title="商品名称" :edit-render="{}" :rules="[{required: true, message:'请填写商品名称', trigger:'blur'}]">
             <template v-slot:edit="scope">
               <el-input @change="ifSameValue" maxlength="64" v-model="scope.row.tradeName"></el-input>
             </template>
           </vxe-table-column>
 
-          <vxe-table-column align="center" field="tradeNumber" title="商品数量" :edit-render="{}">
+          <vxe-table-column min-width="80px" align="center" field="tradeNumber" title="商品数量" :edit-render="{}">
             <template v-slot:edit="scope">
               <el-input @change="changeValue2" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column align="center" field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
+          <vxe-table-column min-width="80px" align="center" field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
             <template v-slot:edit="scope">
               <el-input maxlength="64" v-model="scope.row.company"></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column align="center" field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
+          <vxe-table-column min-width="80px" align="center" field="tradePrice" title="商品单价(元)" :edit-render="{}" :rules="[{required: true, message:'请输入商品单价', trigger:'blur'}]">
             <template v-slot:edit="scope">
               <el-input @change="changeValue2" maxlength="15" v-model="scope.row.tradePrice" @blur="scope.row.tradePrice = twoDecimalPlaces2(scope.row.tradePrice)"></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column align="center" field="priceSum" title="商品总价" :edit-render="{}">
+          <vxe-table-column min-width="80px" align="center" field="priceSum" title="商品总价" :edit-render="{}">
             <template v-slot:edit="scope">
               <el-input :disabled='true' v-model="scope.row.priceSum" @blur="scope.row.priceSum = twoDecimalPlaces(scope.row.priceSum)" maxlength="15"></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column align="center" field="actualPrice" title="实际价格" :edit-render="{}">
+          <vxe-table-column min-width="80px" align="center" field="actualPrice" title="实际价格" :edit-render="{}">
             <template v-slot:edit="scope">
               <el-input v-model="scope.row.actualPrice" @blur="scope.row.actualPrice = twoDecimalPlaces(scope.row.actualPrice)" maxlength="15"></el-input>
             </template>
           </vxe-table-column>
 
-          <vxe-table-column align="center" field="remarks" title="备注" :edit-render="{}">
+          <vxe-table-column min-width="80px" align="center" field="remarks" title="备注" :edit-render="{}">
             <template v-slot:edit="scope">
               <el-input maxlength="255" v-model="scope.row.remarks" ></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column align="center" title="操作" width="180">
+          <vxe-table-column align="center" fixed="right" title="操作" width="250px">
             <template v-slot="scope">
-              <el-button size="mini" type="danger" v-if="!formReadOnly" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
-              <el-button size="mini" type="primary" v-if="!formReadOnly" @click="sss2(scope.$rowIndex)">上传附件</el-button>
-              <el-button size="mini" type="primary" v-if="formReadOnly" :disabled="false" @click="seeFileInfo2(scope.$rowIndex)">查看文件详情</el-button>
+              <el-button size="mini" type="primary"  @click="updateWareHouse(scope.$rowIndex)">修改</el-button>
+              <el-button size="mini" type="primary"  @click="sss2(scope.$rowIndex)">上传附件</el-button>
+              <el-button size="mini" type="danger"  @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
             </template>
           </vxe-table-column>
         </vxe-table>
       </el-row>
+      <el-row>
+        <el-col :span="24" style="margin-top: 20px">
+          <el-form-item label="修改原因" prop="updateCause" :rules="[{required: true, message: '修改原因不能为空', trigger: 'blur'}]">
+            <el-input type="textarea"
+                      :rows="5"
+                      maxlength="500"
+                      placeholder="请填写修改原因"
+                      show-word-limit
+                      v-model="inputForm.updateCause"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <!-- 附件 -->
     <MaterialManagementDialog ref="materialManagementDialog" @getUpload="getUpload"></MaterialManagementDialog>
@@ -250,7 +242,6 @@
     <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
     <CwProgramPageForm ref="cwProgramPageForm" @getProgram="getProgram"></CwProgramPageForm>
     <MaterialTypePullForm ref="materialTypePullForm" @getProgramForType="getProgramForType"></MaterialTypePullForm>
-    <ContractChooseForm  ref="contractChooseForm" @getProject="getContract3"></ContractChooseForm>
     <UserPullForm ref="userPullForm" @getProgramForUser="getProgramForUser"></UserPullForm>
   </div>
 </template>
@@ -316,12 +307,15 @@
           detailInfos: [],
           wareHouse: [],
           // amountInfos: [],
-          files: [] // 附件信息
+          files: [], // 附件信息
+          functionFlag: '',
+          updateCause: ''
         },
-        keyWatch: ''
+        keyWatch: '',
+        tableKey: ''
       }
     },
-    WareHouseService: null,
+    wareHouseService: null,
     MaterialManagementService: null,
     userService: null,
     commonApi: null,
@@ -423,7 +417,9 @@
           detailInfos: [],
           wareHouse: [],
           // amountInfos: [],
-          files: [] // 附件信息
+          files: [], // 附件信息
+          functionFlag: '',
+          updateCause: ''
         }
         if (method === 'add') {
           this.title = `新建采购类型`
@@ -434,47 +430,82 @@
         this.visible = true
         this.loading = false
         this.$nextTick(() => {
-          if (this.formReadOnly === true && this.businessId !== 'false') {
+          if (this.status === 'audit' || this.status === 'taskFormDetail') {
             method = 'view'
           }
           if (this.commonJS.isEmpty(this.inputForm.handledByOffice)) {
             this.inputForm.handledByOffice = JSON.parse(localStorage.getItem('user')).officeDTO.id
           }
-          if (this.status === 'audit' || this.status === 'taskFormDetail') {
-            method = 'view'
-          }
           this.loading = true
           this.$refs.inputForm.resetFields()
-          this.wareHouseService.findById(this.inputForm.id).then(({data}) => {
-            if (this.commonJS.isNotEmpty(data.wareHouseManId)) {
-              this.wareHouseManId = data.wareHouseManId
-            }
-            if (this.commonJS.isNotEmpty(data.wareHouseTypeId)) {
-              this.wareHouseTypeId = data.wareHouseTypeId
-            }
-            this.inputForm = this.recover(this.inputForm, data)
-            if (this.commonJS.isEmpty(this.inputForm.handledByOffice)) {
-              this.inputForm.handledByOffice = JSON.parse(localStorage.getItem('user')).officeDTO.id
-            }
-            let i = this.inputForm.detailInfos.length
-            for (let j = 0; j < i; j++) {
-              if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
-                if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
-                  this.inputForm.detailInfos[j].priceSum = this.inputForm.detailInfos[j].tradePrice * this.inputForm.detailInfos[j].tradeNumber
+          this.wareHouseService.findById(this.inputForm.id, this.status).then(({data}) => {
+            this.$refs.uploadComponent.clearUpload()
+            if (data.status === '5' && this.status === 'taskFormDetail') { // 当前正在查询已通过的流程详情页
+              this.wareHouseService.findLastHiByid(this.inputForm.id).then(({data}) => {
+                if (this.commonJS.isNotEmpty(data.wareHouseManId)) {
+                  this.wareHouseManId = data.wareHouseManId
+                }
+                if (this.commonJS.isNotEmpty(data.wareHouseTypeId)) {
+                  this.wareHouseTypeId = data.wareHouseTypeId
+                }
+                this.inputForm = this.recover(this.inputForm, data)
+                this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+                if (this.commonJS.isNotEmpty(this.inputForm.detailInfos)) {
+                  let i = this.inputForm.detailInfos.length
+                  for (let j = 0; j < i; j++) {
+                    if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+                      if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
+                        this.inputForm.detailInfos[j].priceSum = this.inputForm.detailInfos[j].tradePrice * this.inputForm.detailInfos[j].tradeNumber
+                      }
+                    }
+                  }
                 }
+                if (this.commonJS.isNotEmpty(this.inputForm.wareHouse)) {
+                  let k = this.inputForm.wareHouse.length
+                  for (let j = 0; j < k; j++) {
+                    if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradePrice)) {
+                      if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradeNumber)) {
+                        this.inputForm.wareHouse[j].priceSum = this.inputForm.wareHouse[j].tradePrice * this.inputForm.wareHouse[j].tradeNumber
+                      }
+                    }
+                  }
+                }
+                this.$refs.uploadComponent.newUpload('view', this.inputForm.files, 'wareHouse')
+                this.loading = false
+                this.tableKey = Math.random()
+              })
+            } else {
+              if (this.commonJS.isNotEmpty(data.wareHouseManId)) {
+                this.wareHouseManId = data.wareHouseManId
               }
-            }
-            let k = this.inputForm.wareHouse.length
-            for (let j = 0; j < k; j++) {
-              if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradePrice)) {
-                if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradeNumber)) {
-                  this.inputForm.wareHouse[j].priceSum = this.inputForm.wareHouse[j].tradePrice * this.inputForm.wareHouse[j].tradeNumber
+              if (this.commonJS.isNotEmpty(data.wareHouseTypeId)) {
+                this.wareHouseTypeId = data.wareHouseTypeId
+              }
+              this.inputForm = this.recover(this.inputForm, data)
+              if (this.commonJS.isEmpty(this.inputForm.handledByOffice)) {
+                this.inputForm.handledByOffice = JSON.parse(localStorage.getItem('user')).officeDTO.id
+              }
+              let i = this.inputForm.detailInfos.length
+              for (let j = 0; j < i; j++) {
+                if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
+                  if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
+                    this.inputForm.detailInfos[j].priceSum = this.inputForm.detailInfos[j].tradePrice * this.inputForm.detailInfos[j].tradeNumber
+                  }
                 }
               }
+              let k = this.inputForm.wareHouse.length
+              for (let j = 0; j < k; j++) {
+                if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradePrice)) {
+                  if (this.commonJS.isNotEmpty(this.inputForm.wareHouse[j].tradeNumber)) {
+                    this.inputForm.wareHouse[j].priceSum = this.inputForm.wareHouse[j].tradePrice * this.inputForm.wareHouse[j].tradeNumber
+                  }
+                }
+              }
+              this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
+              this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+              this.loading = false
+              this.tableKey = Math.random()
             }
-            this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'reimbursement')
-            this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
-            this.loading = false
           })
           if (method !== 'edit' && method !== 'view') {
             this.$refs.uploadComponent.newUpload(method, [], 'reimbursement')
@@ -490,7 +521,30 @@
         })
       },
       close () {
+        this.inputForm = {
+          procInsId: '',
+          wareHouseTotalPrice: '', // 入库商品总价
+          wareHouseActualPrice: '', // 入库商品实际价格
+          tradeTotalPrice: '',  // 商品总价
+          fileInfoLost: [],
+          purchaseNo: '',
+          handledBy: '',
+          handledById: '',
+          handledByOffice: '',
+          wareHouseName: '',
+          wareHouseNumber: '', // 入库编号
+          userId: '',
+          wareHouseDate: '',
+          remarks: '',
+          detailInfos: [],
+          wareHouse: [],
+          // amountInfos: [],
+          files: [], // 附件信息
+          functionFlag: '',
+          updateCause: ''
+        }
         this.method = ''
+        this.inputForm.functionFlag = ''
         this.inputForm.detailInfos = []
         this.inputForm.wareHouse = []
         this.inputForm.amountInfos = []
@@ -501,7 +555,7 @@
       // 新增
       async insertEvent (type) {
         if (type === 'detail') {
-          await this.$refs.detailTable.insert().then((data) => {
+          await this.$refs.detailTableWare.insert().then((data) => {
             data.wareHouseManId = this.wareHouseManId
             data.wareHouseMan = this.name
             data.wareHouseManOffice = this.officeName
@@ -509,14 +563,10 @@
             this.inputForm.wareHouse.push(data)
           })
         }
-        if (type === 'amount') {
-          await this.$refs.amountTable.insert().then((data) => {
-            this.inputForm.amountInfos.push(data)
-          })
-        }
       },
       startForm (callback) {
         this.loading = true
+        this.inputForm.functionFlag = 'start'
         if (this.commonJS.isNotEmpty(this.inputForm.id)) {
           this.wareHouseService.findById(this.inputForm.id).then(({data}) => {
             // 审核状态不是“未发起”或“暂存”或“撤回”或“已完成”，就弹出提示
@@ -573,6 +623,7 @@
             this.loading = true
             if (this.$refs.uploadComponent.checkProgress()) {
               this.loading = false
+              this.inputForm.functionFlag = ''
               return
             }
             if (this.commonJS.isEmpty(this.inputForm.files)) {
@@ -581,6 +632,7 @@
             if (this.commonJS.isEmpty(this.inputForm.wareHouse)) {
               this.$message.error('至少填写一条入库详情信息')
               this.loading = false
+              this.inputForm.functionFlag = ''
               return
             } else {
               let i = this.inputForm.wareHouse.length
@@ -589,11 +641,13 @@
                 if (this.commonJS.isEmpty(this.inputForm.wareHouse[j].wareHouseMan)) {
                   this.$message.error('入库详情第' + k + '行请选择入库人')
                   this.loading = false
+                  this.inputForm.functionFlag = ''
                   return
                 }
                 if (this.commonJS.isEmpty(this.inputForm.wareHouse[j].wareHouseType)) {
                   this.$message.error('入库详情第' + k + '行请选择入库类型')
                   this.loading = false
+                  this.inputForm.functionFlag = ''
                   return
                 }
               }
@@ -602,10 +656,12 @@
             this.inputForm.status = '2'
             this.wareHouseService.save(this.inputForm).then(({data}) => {
               this.inputForm.id = data.businessId
+              this.inputForm.functionFlag = ''
               callback(data.businessTable, data.businessId, this.inputForm)
               this.$refs.inputForm.resetFields()
               this.loading = false
             }).catch(() => {
+              this.inputForm.functionFlag = ''
               this.$refs.inputForm.resetFields()
               this.loading = false
             })
@@ -629,11 +685,14 @@
             }
             this.inputForm.files = this.$refs.uploadComponent.getDataList()
             this.inputForm.status = '5'
+            this.inputForm.functionFlag = 'agree'
             this.wareHouseService.save(this.inputForm).then(({data}) => {
               callback(data.businessTable, data.businessId, this.inputForm)
               this.loading = false
+              this.inputForm.functionFlag = ''
             }).catch(() => {
               this.loading = false
+              this.inputForm.functionFlag = ''
             })
           } else {
             this.loading = false
@@ -678,8 +737,7 @@
                 throw new Error()
               } else {
                 // 终止
-                let param = {status: '1', id: this.inputForm.id}
-                this.wareHouseService.updateStatusById(param).then(() => {
+                this.wareHouseService.backSourceData(this.inputForm.id).then(() => {
                   this.loading = false
                   callback()
                 })
@@ -871,14 +929,10 @@
       // 删除
       removeEvent (row, rowIndex, type) {
         if (type === 'detail') {
-          this.$refs.detailTable.remove(row)
-          // this.inputForm.detailInfos.splice(rowIndex, 1)
+          this.$message.success('所选行标记为已删除，保存后生效')
+          this.$refs.detailTableWare.remove(row)
           this.inputForm.wareHouse.splice(rowIndex, 1)
         }
-        if (type === 'amount') {
-          this.$refs.amountTable.remove(row)
-          this.inputForm.amountInfos.splice(rowIndex, 1)
-        }
       },
       ifSameValue () {
         let i = this.inputForm.wareHouse.length
@@ -895,25 +949,22 @@
           }
         }
       },
-      openContractChooseForm () {
-        this.$refs.contractChooseForm.init()
-      },
-      getContract3 (row) {
-        console.log('row', row)
-        this.inputForm.contractNo = row.contractNo
-        // this.materialManagementService.findById(id).then(({data}) => {
-        //   this.inputForm.detailInfos = data.detailInfos
-        //   this.inputForm.purchaseNo = data.purchaseNo
-        //   let i = this.inputForm.detailInfos.length
-        //   for (let j = 0; j < i; j++) {
-        //     if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradePrice)) {
-        //       if (this.commonJS.isNotEmpty(this.inputForm.detailInfos[j].tradeNumber)) {
-        //         this.inputForm.detailInfos[j].priceSum = this.inputForm.detailInfos[j].tradePrice * this.inputForm.detailInfos[j].tradeNumber
-        //       }
-        //     }
-        //   }
-        // })
-        this.$forceUpdate()
+      // 入库详情修改
+      updateWareHouse (index) {
+        this.$message.success('所选行标记为已修改，保存后生效')
+        this.inputForm.wareHouse[index].upFlag = '1'
+      },
+      // 列表行颜色
+      rowClassName ({ row, rowIndex }) {
+        if (row.upFlag === '1') { // 修改前
+          return 'row-grey'
+        } else if (row.upFlag === '2') { // 已删除
+          return 'row-red'
+        } else if (row.upFlag === '0' && this.commonJS.isNotEmpty(row.sourceId)) { // 修改后
+          return 'row-green'
+        } else if (row.upFlag === '0' && this.commonJS.isEmpty(row.sourceId)) { // 未被修改过的数据
+          return ''
+        }
       }
     }
   }
@@ -923,4 +974,18 @@
     font-size: 16px;
     font-weight: bold;
   }
+  /deep/  .row-green {
+    /*background-color: #67c23ad1;*/
+    /*color: #fff;*/
+    font-weight: bold;
+  }
+  /deep/  .row-grey {
+    background-color: #b8b7b7;
+    color: #fff;
+  }
+  /deep/  .row-red {
+    background-color: #f56c6c66;
+    /*color: #fff;*/
+    font-weight: bold;
+  }
 </style>

src/views/modules/sys/dashboard/workBench/Pending.vue

@@ -529,6 +529,7 @@
           this.$router.push({
             path: '/flowable/task/TaskForm',
             query: {
+              wareHouseId: row.processDefinitionName === '物资管理-入库修改' ? data.businessId : '',
               isShow: false,
               formReadOnly: true,
               formTitle: `${row.vars.title}`,