排产申请的分页列表、编辑、详情、流程及车型常用配置列表

anrui-scm/anrui-scm-ui/src/api/flow/todo.js

@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+
+// 代办任务同意办理
+export function businessAgree(params) {
+  return request({
+    url: '/portal/v1/flow/complete',
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 代办任务驳回任务
+export function rejectTask(params) {
+  return request({
+    url: '/portal/v1/flow/reject/' + params.businessSid,
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 代办任务终止任务
+export function breakTask(params) {
+  return request({
+    url: '/portal/v1/flow/breakProcess/' + params.businessSid,
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
+// 代办任务撤回任务
+export function revokeTask(params) {
+  return request({
+    url: '/portal/v1/flow/revokeProcess/' + params.userSid + '/' + params.businessSid,
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+

anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js

@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/scm/v1/scmapplyinbound/listPage',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 保存修改记录
+  saveOrUpdate: function(params) {
+    return request({
+      url: '/scm/v1/scmapplyinbound/saveOrUpdateApplyInBound',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 提交流程
+  submitVehicleApply: function(params) {
+    return request({
+      url: '/base/v1/busvehicleapply/submitVehicleApply',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 通过sid删除一条或多条记录
+  delBySids: function(params) {
+    return request({
+      url: '/base/v1/busvehicleapply/delBySids',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 通过sid查询一条记录
+  fetchBySid: function(sid) {
+    return request({
+      url: '/scm/v1/scmapplyinbound/fetchSid/' + sid,
+      method: 'get'
+    })
+  }
+}

anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@@ -243,10 +243,40 @@ const codemenu = [
         path: '/vehicle/cheliangpaichan',
         component: () => import('@/views/supplychain/vehicle/cheliangpaichan/cheliangpaichan.vue'),
         name: 'cheliangpaichan',
-        meta: { title: '车辆排产管理' }
+        meta: { title: '排产管理' }
       }
     ]
-  }
+  },
+
+  {
+    path: '/ruzhang',
+    component: Layout,
+    redirect: '/ruzhang',
+    meta: {
+      title: '入账管理'
+    },
+    children: [{
+      path: '/ruzhang/ruzhangguanli',
+      component: () => import('@/views/ruzhang/ruzhangguanli/ruzhangguanli.vue'),
+      name: 'ruzhangguanli',
+      meta: { title: '入账单管理' }
+    }]
+  },
 
+  // 排产管理
+  // 排产管理申请详情
+  {
+    path: '/paichanguanliFlow/paichanguanli/cheliangpaichanInfo',
+    component: () =>
+      import('@/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanInfo.vue'),
+    name: 'cheliangpaichanInfo'
+  },
+  // 排产管理申请编辑
+  {
+    path: '/paichanguanliFlow/paichanguanli/cheliangpaichanEdit',
+    component: () =>
+      import('@/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue'),
+    name: 'cheliangpaichanEdit'
+  }
 ]
 export default codemenu

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@@ -0,0 +1,276 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存
+          </el-button>
+          <el-button type="primary" size="small" @click="submitVehicleApply()">提交
+          </el-button>
+          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="wlInfo"><span>车辆入账单</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
+          <el-row class="lineone">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请编号:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationCode" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="采购订单编号:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.purchaseOrderNo" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请人:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="车型:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.modelName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="常用配置:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.configName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linethree">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" clearable/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="tableStyle">
+            <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.vehicleList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="车架号" align="left" header-align="center">
+              <template slot-scope="scope" prop="vehicleName">
+                <el-input v-model="scope.row.vinNo" placeholder="" class="addinputw" clearable/>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center">
+              <template slot-scope="scope" prop="remarks">
+                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row style="margin-top: 10px">
+            <el-col>
+              <el-col :span="3" class="el-form-item-right">
+                <el-form-item label="厂家发车日期:"></el-form-item>
+              </el-col>
+              <el-col :span="21">
+                <el-form-item>
+                  <el-date-picker value-format="yyyy-MM-dd" v-model="formobj.departureDate" clearable type="date" placeholder="开始日期"/>
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+  </div>
+</template>
+
+<script>
+import req from '@/api/ruzhang/scmapplyinbound'
+export default {
+  name: 'ruzhangAdd',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        applicationSid: window.sessionStorage.getItem('userSid'), // 用户人sid
+        applicationName: window.sessionStorage.getItem('name'), // 申请人
+        applicationCode: '', // 申请编号
+        configName: '',
+        departureDate: '',
+        modelName: '',
+        modelSid: '',
+        purchaseOrderNo: '',
+        remarks: '', // 备注
+        vehicleOrderSid: '',
+        vehicleList: []
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    showEdit(sid, row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '【编辑】入账单'
+      console.log('编辑回显', sid, row)
+      req.fetchBySid(sid).then((resp) => {
+        const data = resp.data
+        this.formobj.applicationCode = data.applicationCode
+        this.formobj.remarks = data.remarks
+        this.formobj.sid = sid
+        this.formobj.configName = data.configName
+        this.formobj.departureDate = data.departureDate
+        this.formobj.modelName = data.modelName
+        this.formobj.modelSid = data.modelSid
+        this.formobj.purchaseOrderNo = data.purchaseOrderNo
+        this.formobj.vehicleOrderSid = data.vehicleOrderSid
+        if (data.inboundVehicleList.length > 0) {
+          data.inboundVehicleList.forEach((e) => {
+            this.formobj.vehicleList.push({
+              applySid: e.applySid,
+              remarks: e.remarks,
+              modelSid: e.modelSid,
+              sid: e.sid,
+              vinNo: e.vinNo
+            })
+          })
+        } else {
+          for (var i = 0; i < row[0].vehicleNum; i++) {
+            this.formobj.vehicleList.push({
+              applySid: '',
+              remarks: '',
+              modelSid: this.formobj.modelSid,
+              sid: '',
+              vinNo: ''
+            })
+          }
+        }
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    saveEdit() {
+      console.log(this.formobj, 636363)
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            this.$message({
+              showClose: true,
+              type: 'success',
+              message: resp.msg
+            })
+            this.handleReturn('true')
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    submitVehicleApply() {
+      req.submitVehicleApply(this.formobj).then((res) => {
+        if (res.code == '200') {
+          this.$message({
+            showClose: true,
+            type: 'success',
+            message: '提交成功'
+          })
+          this.handleReturn('true')
+        } else {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '提交失败'
+          })
+        }
+      })
+    },
+    // 返回（===既判断又赋值）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj.departureDate = ''
+      this.formobj.remarks = '' // 备注
+      this.formobj.vehicleList = []
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    },
+  }
+}
+</script>
+
+<style scoped>
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
+.lineone {
+  border-bottom: 2px solid #e0e3eb;
+}
+.lineone .el-form-item {
+  margin-bottom: -10px;
+}
+.lineone >>> .el-input__inner {
+  border: 0;
+}
+.linetwo {
+  margin-top: 10px;
+}
+.linetwo .el-form-item {
+  margin-bottom: 0px !important;
+}
+.linetwo >>> .el-input__inner {
+  border: 0;
+}
+.linethree .el-form-item {
+  margin-bottom: 0px !important;
+}
+.tableStyle {
+  background-color: #FFFFFF;
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.el-form-item-right {
+  /* padding: 0 10px 0 0; */
+  text-align: right;
+}
+</style>
+

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue

@@ -0,0 +1,219 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="wlInfo"><span>车辆入账单</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
+          <el-row class="lineone">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请编号:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationCode" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="采购订单编号:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.purchaseOrderNo" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请人:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="车型:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.modelName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="常用配置:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.configName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" clearable readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="tableStyle">
+            <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.vehicleList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="车架号" align="left" header-align="center">
+              <template slot-scope="scope" prop="vehicleName">
+                <el-input v-model="scope.row.vinNo" placeholder="" class="addinputw" clearable readonly/>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center">
+              <template slot-scope="scope" prop="remarks">
+                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable readonly/>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row class="linetwo" style="margin-top: 10px">
+            <el-col>
+              <el-col :span="3" class="el-form-item-right">
+                <el-form-item label="厂家发车日期:"></el-form-item>
+              </el-col>
+              <el-col :span="21">
+                <el-form-item>
+                  <el-input v-model="formobj.departureDate" placeholder="" class="addinputw" clearable readonly/>
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+  </div>
+</template>
+
+<script>
+import req from '@/api/ruzhang/scmapplyinbound'
+export default {
+  name: 'ruzhangInfo',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        applicationSid: window.sessionStorage.getItem('userSid'), // 用户人sid
+        applicationName: window.sessionStorage.getItem('name'), // 申请人
+        applicationCode: '', // 申请编号
+        configName: '',
+        departureDate: '',
+        modelName: '',
+        modelSid: '',
+        purchaseOrderNo: '',
+        remarks: '', // 备注
+        vehicleOrderSid: '',
+        vehicleList: []
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    showInfo(sid, row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '入账单详情'
+      console.log('编辑回显', sid, row)
+      req.fetchBySid(sid).then((resp) => {
+        const data = resp.data
+        this.formobj.applicationCode = data.applicationCode
+        this.formobj.remarks = data.remarks
+        this.formobj.sid = sid
+        this.formobj.configName = data.configName
+        this.formobj.departureDate = data.departureDate
+        this.formobj.modelName = data.modelName
+        this.formobj.modelSid = data.modelSid
+        this.formobj.purchaseOrderNo = data.purchaseOrderNo
+        this.formobj.vehicleOrderSid = data.vehicleOrderSid
+        if (data.inboundVehicleList.length > 0) {
+          data.inboundVehicleList.forEach((e) => {
+            this.formobj.vehicleList.push({
+              applySid: e.applySid,
+              remarks: e.remarks,
+              modelSid: e.modelSid,
+              sid: e.sid,
+              vinNo: e.vinNo
+            })
+          })
+        }
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    // 返回（===既判断又赋值）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj.departureDate = ''
+      this.formobj.remarks = '' // 备注
+      this.formobj.vehicleList = []
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    },
+  }
+}
+</script>
+
+<style scoped>
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
+.lineone {
+  border-bottom: 2px solid #e0e3eb;
+}
+.lineone .el-form-item {
+  margin-bottom: -10px;
+}
+.lineone >>> .el-input__inner {
+  border: 0;
+}
+.linetwo {
+  margin-top: 10px;
+}
+.linetwo .el-form-item {
+  margin-bottom: 0px !important;
+}
+.linetwo >>> .el-input__inner {
+  border: 0;
+}
+.tableStyle {
+  background-color: #FFFFFF;
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.el-form-item-right {
+  text-align: right;
+}
+</style>
+

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue

@@ -0,0 +1,258 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>入账申请单管理</div>
+        <div>
+<!--          <el-button type="danger" size="small" @click="doDel()">删除</el-button>-->
+          <el-button type="primary" size="small">提交</el-button>
+          <el-button type="info" size="small">关闭</el-button>
+        </div>
+      </div>
+      <div class="searchcon">
+        <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
+        </el-button>
+        <div v-show="isSearchShow" class="search">
+          <el-form :inline="true" class="tab-header">
+            <el-form-item label="采购订单编号:">
+              <el-input v-model="queryParams.params.purchaseOrderNo" placeholder="" clearable/>
+            </el-form-item>
+            <el-form-item label="车型:">
+              <el-input v-model="queryParams.params.modelName" placeholder="" clearable/>
+            </el-form-item>
+            <el-form-item class="formItem" label="申请日期:">
+              <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateStart" clearable style="width: 160px;" type="date" placeholder="开始日期"/>
+              <div class="line">至</div>
+              <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateEnd" clearable style="width: 160px;" type="date" placeholder="结束日期"/>
+            </el-form-item>
+            <el-form-item label="状态:">
+              <el-input v-model="queryParams.params.nodeState" placeholder="" clearable/>
+            </el-form-item>
+            <el-divider/>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" @click="dosearch" icon="el-icon-search">查询</el-button>
+              <el-button type="primary" @click="resetQuery">重置</el-button>
+            </div>
+          </el-form>
+        </div>
+      </div>
+      <!--Start 项目列表头部-->
+      <div class="listtop">
+        <div class="tit">入账申请列表</div>
+        <pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
+      </div>
+      <!--End 项目列表头部-->
+
+      <!--Start 项目列表-->
+      <div class="listcon">
+        <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
+          <el-table-column width="50" type="selection" align="center"/>
+          <el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table-column width="150" label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button type="primary" size="small" :disabled="scope.row.nodeState =='' ? false : scope.row.nodeState == '排产申请' ? false : true" @click="toEdit(scope.row)">办理</el-button>
+              <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column width="150" prop="nodeState" label="状态" align="center"/>
+          <el-table-column width="200" prop="applicationCode" label="申请编号" align="center"/>
+          <el-table-column width="150" prop="applicationDate" label="申请日期" align="center"/>
+          <el-table-column width="200" prop="purchaseOrderNo" label="采购订单编号" align="center"/>
+          <el-table-column prop="modelName" label="车型" align="center"/>
+          <el-table-column width="150" prop="vehicleNum" fit label="台数" align="center"/>
+        </el-table>
+      </div>
+      <!--End 项目列表-->
+      <div class="pages">
+        <!-- 翻页 -->
+        <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
+      </div>
+    </div>
+    <!--End 查询和其列表部分-->
+
+    <!--新增修改部分组件-->
+    <div-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
+    <!--详情部分组件-->
+    <div-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
+  </div>
+</template>
+
+<script>
+import req from '@/api/ruzhang/scmapplyinbound'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import divAdd from './ruzhangAdd'
+import divInfo from './ruzhangInfo'
+
+export default {
+  name: 'ruzhangguanli',
+  components: {
+    ButtonBar,
+    Pagination,
+    pageye,
+    divAdd,
+    divInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false, // 显示隐藏
+      tableLoading: false,
+      // 列表数据
+      dataList: [],
+      // sid数组
+      sids: [], // 用于导出的时候保存已选择SID
+      sides: '', // 一条数据的sid
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          applicationDateStart: '',
+          applicationDateEnd: '',
+          nodeState: '',
+          purchaseOrderNo: '',
+          modelName: ''
+        }
+      },
+      row: {}
+    }
+  },
+  created() {
+    this.loadList()
+  },
+  methods: {
+    // 获取数据sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+      this.row = row
+      this.sides = this.sids.join() // 将sid数组的元素转化成字符串
+      console.log('获取sids数组', this.sids)
+    },
+    toEdit() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
+        return
+      }
+      if (this.sids.length > 1) {
+        this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
+        return
+      }
+      this.viewState = 3
+      const sid = this.sids[0]
+      const row = this.row
+      this.$refs['divadd'].showEdit(sid, row)
+    },
+    toInfo(row) {
+      this.viewState = 4
+      console.log('这是打开详情接口', row)
+      const sid = row.sid
+      this.$refs['divinfo'].showInfo(sid, row)
+    },
+    // 查询
+    dosearch() {
+      this.queryParams.current = 1
+      this.loadList()
+    },
+    // 重置
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+          size: 10,
+          total: 0,
+          params: {
+          applicationDateStart: '',
+            applicationDateEnd: '',
+            nodeState: '',
+            purchaseOrderNo: '',
+            modelName: ''
+        }
+      }
+      this.dosearch()
+    },
+    // 加载分页列表
+    loadList() {
+      const _this = this
+      this.tableLoading = true
+      req.listPage(this.queryParams).then(resp => {
+        console.log('查询列表', resp)
+        _this.tableLoading = false
+        const data = resp.data
+        _this.queryParams.total = data.total
+        _this.dataList = data.records
+      }).catch(() => {
+        _this.tableLoading = false
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 删除
+    doDel(row) {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+        return
+      }
+      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        const _this = this
+        req.delBySids(this.sids).then(resp => {
+          loading.close()
+          _this.$message({ type: 'success', message: resp.msg, showClose: true })
+          _this.loadList()
+        }).catch(e => {
+          loading.close()
+        })
+      }).catch(() => {})
+    },
+    // 子组件关闭（返回）
+    resetState() {
+      this.viewState = 1
+      this.loadList()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.line {
+  display: inline-block;
+  margin: 0px 15px;
+}
+.listtop {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.tit {
+  margin-bottom: -10px;
+}
+
+.pagination {
+  margin-bottom: -10px;
+}
+.formItem {
+  margin-right: 28px;
+}
+</style>

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@@ -0,0 +1,276 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存
+          </el-button>
+          <el-button type="primary" size="small" @click="submitVehicleApply()">提交
+          </el-button>
+          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="wlInfo"><span>车辆入账单</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
+          <el-row class="lineone">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请编号:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationCode" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="采购订单编号:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.purchaseOrderNo" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请人:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="车型:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.modelName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="常用配置:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.configName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linethree">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" clearable/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="tableStyle">
+            <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.vehicleList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="车架号" align="left" header-align="center">
+              <template slot-scope="scope" prop="vehicleName">
+                <el-input v-model="scope.row.vinNo" placeholder="" class="addinputw" clearable/>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center">
+              <template slot-scope="scope" prop="remarks">
+                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row style="margin-top: 10px">
+            <el-col>
+              <el-col :span="3" class="el-form-item-right">
+                <el-form-item label="厂家发车日期:"></el-form-item>
+              </el-col>
+              <el-col :span="21">
+                <el-form-item>
+                  <el-date-picker value-format="yyyy-MM-dd" v-model="formobj.departureDate" clearable type="date" placeholder="开始日期"/>
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+  </div>
+</template>
+
+<script>
+import req from '@/api/ruzhang/scmapplyinbound'
+export default {
+  name: 'ruzhangAdd',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        applicationSid: window.sessionStorage.getItem('userSid'), // 用户人sid
+        applicationName: window.sessionStorage.getItem('name'), // 申请人
+        applicationCode: '', // 申请编号
+        configName: '',
+        departureDate: '',
+        modelName: '',
+        modelSid: '',
+        purchaseOrderNo: '',
+        remarks: '', // 备注
+        vehicleOrderSid: '',
+        vehicleList: []
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    showEdit(sid, row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '【编辑】入账单'
+      console.log('编辑回显', sid, row)
+      req.fetchBySid(sid).then((resp) => {
+        const data = resp.data
+        this.formobj.applicationCode = data.applicationCode
+        this.formobj.remarks = data.remarks
+        this.formobj.sid = sid
+        this.formobj.configName = data.configName
+        this.formobj.departureDate = data.departureDate
+        this.formobj.modelName = data.modelName
+        this.formobj.modelSid = data.modelSid
+        this.formobj.purchaseOrderNo = data.purchaseOrderNo
+        this.formobj.vehicleOrderSid = data.vehicleOrderSid
+        if (data.inboundVehicleList.length > 0) {
+          data.inboundVehicleList.forEach((e) => {
+            this.formobj.vehicleList.push({
+              applySid: e.applySid,
+              remarks: e.remarks,
+              modelSid: e.modelSid,
+              sid: e.sid,
+              vinNo: e.vinNo
+            })
+          })
+        } else {
+          for (var i = 0; i < row[0].vehicleNum; i++) {
+            this.formobj.vehicleList.push({
+              applySid: '',
+              remarks: '',
+              modelSid: this.formobj.modelSid,
+              sid: '',
+              vinNo: ''
+            })
+          }
+        }
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    saveEdit() {
+      console.log(this.formobj, 636363)
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((resp) => {
+            this.submitdisabled = false
+            this.$message({
+              showClose: true,
+              type: 'success',
+              message: resp.msg
+            })
+            this.handleReturn('true')
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    submitVehicleApply() {
+      req.submitVehicleApply(this.formobj).then((res) => {
+        if (res.code == '200') {
+          this.$message({
+            showClose: true,
+            type: 'success',
+            message: '提交成功'
+          })
+          this.handleReturn('true')
+        } else {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '提交失败'
+          })
+        }
+      })
+    },
+    // 返回（===既判断又赋值）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj.departureDate = ''
+      this.formobj.remarks = '' // 备注
+      this.formobj.vehicleList = []
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    },
+  }
+}
+</script>
+
+<style scoped>
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
+.lineone {
+  border-bottom: 2px solid #e0e3eb;
+}
+.lineone .el-form-item {
+  margin-bottom: -10px;
+}
+.lineone >>> .el-input__inner {
+  border: 0;
+}
+.linetwo {
+  margin-top: 10px;
+}
+.linetwo .el-form-item {
+  margin-bottom: 0px !important;
+}
+.linetwo >>> .el-input__inner {
+  border: 0;
+}
+.linethree .el-form-item {
+  margin-bottom: 0px !important;
+}
+.tableStyle {
+  background-color: #FFFFFF;
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.el-form-item-right {
+  /* padding: 0 10px 0 0; */
+  text-align: right;
+}
+</style>
+

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangInfo.vue

@@ -0,0 +1,219 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="wlInfo"><span>车辆入账单</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
+          <el-row class="lineone">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请编号:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationCode" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="采购订单编号:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.purchaseOrderNo" readonly/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="申请人:"></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.applicationName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="车型:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.modelName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="常用配置:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.configName" readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="linetwo">
+            <el-col :span="3" class="el-form-item-right">
+              <el-form-item label="备注:"></el-form-item>
+            </el-col>
+            <el-col :span="21">
+              <el-form-item>
+                <el-input v-model="formobj.remarks" clearable readonly/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="tableStyle">
+            <div style="margin-left: 5px;font-weight: bold">车辆列表</div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.vehicleList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="车架号" align="left" header-align="center">
+              <template slot-scope="scope" prop="vehicleName">
+                <el-input v-model="scope.row.vinNo" placeholder="" class="addinputw" clearable readonly/>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" header-align="center">
+              <template slot-scope="scope" prop="remarks">
+                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable readonly/>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row class="linetwo" style="margin-top: 10px">
+            <el-col>
+              <el-col :span="3" class="el-form-item-right">
+                <el-form-item label="厂家发车日期:"></el-form-item>
+              </el-col>
+              <el-col :span="21">
+                <el-form-item>
+                  <el-input v-model="formobj.departureDate" placeholder="" class="addinputw" clearable readonly/>
+                </el-form-item>
+              </el-col>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+  </div>
+</template>
+
+<script>
+import req from '@/api/ruzhang/scmapplyinbound'
+export default {
+  name: 'ruzhangInfo',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        applicationSid: window.sessionStorage.getItem('userSid'), // 用户人sid
+        applicationName: window.sessionStorage.getItem('name'), // 申请人
+        applicationCode: '', // 申请编号
+        configName: '',
+        departureDate: '',
+        modelName: '',
+        modelSid: '',
+        purchaseOrderNo: '',
+        remarks: '', // 备注
+        vehicleOrderSid: '',
+        vehicleList: []
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    showInfo(sid, row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '入账单详情'
+      console.log('编辑回显', sid, row)
+      req.fetchBySid(sid).then((resp) => {
+        const data = resp.data
+        this.formobj.applicationCode = data.applicationCode
+        this.formobj.remarks = data.remarks
+        this.formobj.sid = sid
+        this.formobj.configName = data.configName
+        this.formobj.departureDate = data.departureDate
+        this.formobj.modelName = data.modelName
+        this.formobj.modelSid = data.modelSid
+        this.formobj.purchaseOrderNo = data.purchaseOrderNo
+        this.formobj.vehicleOrderSid = data.vehicleOrderSid
+        if (data.inboundVehicleList.length > 0) {
+          data.inboundVehicleList.forEach((e) => {
+            this.formobj.vehicleList.push({
+              applySid: e.applySid,
+              remarks: e.remarks,
+              modelSid: e.modelSid,
+              sid: e.sid,
+              vinNo: e.vinNo
+            })
+          })
+        }
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    // 返回（===既判断又赋值）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj.departureDate = ''
+      this.formobj.remarks = '' // 备注
+      this.formobj.vehicleList = []
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    },
+  }
+}
+</script>
+
+<style scoped>
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
+.lineone {
+  border-bottom: 2px solid #e0e3eb;
+}
+.lineone .el-form-item {
+  margin-bottom: -10px;
+}
+.lineone >>> .el-input__inner {
+  border: 0;
+}
+.linetwo {
+  margin-top: 10px;
+}
+.linetwo .el-form-item {
+  margin-bottom: 0px !important;
+}
+.linetwo >>> .el-input__inner {
+  border: 0;
+}
+.tableStyle {
+  background-color: #FFFFFF;
+  display: flex;
+  justify-content: start;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
+.el-form-item-right {
+  text-align: right;
+}
+</style>
+