Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/api/Common/dictcommons.js

@@ -8,6 +8,15 @@ export function typeValues(data) {
   })
 }
 
+// 获取数据字典（根据分组）
+export function getTypeValueList(data) {
+  return request({
+    url: '/portal/v1/dictcommons/getTypeValueList',
+    method: 'get',
+    params: data
+  })
+}
+
 // 根据当前登录人orgSidPath(全路径sid)查询分公司
 export function getOrgSidByPath(data) {
   return request({
@@ -182,3 +191,14 @@ export function getAsBusrepairBill(params) {
     }
   })
 }
+// 查询分页列表 --商品类别列表
+export function getGoodsCategory(params) {
+  return request({
+    url: '/as/v1/AsBusrepairBill/listPage',
+    method: 'post',
+    data: params,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}

yxt-as-ui/src/api/storage/adjustment.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+export default {
+
+// 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/wms/apiadmin/WmsShelfBill/listPage',
+      method: 'post',
+      data: params,
+       headers: { 'Content-Type': 'application/json' }
+    })
+  },
+
+  // 初始化
+  init: function(data) {
+    return request({
+      url: '/wms/apiadmin/WmsShelfBill/details?sid='+data,
+      method: 'get'
+    });
+  },
+
+
+  // 新增、保存
+  save: function(data) {
+    return request({
+      url: '/wms/apiadmin/WmsShelfBill/saveOrUpdate',
+      method: 'post',
+      data: data,
+       headers: { 'Content-Type': 'application/json' }
+    });
+  },
+
+
+  deleteBySids: function(data) {
+    return request({
+      url: '/wms/apiadmin/WmsShelfBill/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+
+}

yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue

@@ -0,0 +1,265 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <!-- 标题 -->
+        <div>{{title}}定调价策略申请</div>
+        <!-- start 添加修改按钮 -->
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submintdate">提交</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+        <!-- end 添加修改按钮 -->
+        <!-- end 详情按钮 -->
+      </div>
+
+      <div class="listconadd">
+
+        <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+          <!-- <div class="title">
+          <div>基础信息</div>
+        </div> -->
+          <el-row class="first_row">
+
+            <el-col :span="8">
+              <div class="span-sty">申请人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
+                  type="textarea" :rows="4" clearable /></el-form-item>
+            </el-col>
+          </el-row>
+
+          <div class="title titleOne">
+            <div>商品类别列表</div>
+            <el-button type="primary" size="mini" class="btntopblueline" @click="categoryAdd()">添加</el-button>
+          </div>
+          <el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
+            <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+            <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column fixed label="操作" wid align="center" width="200">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button>
+                <el-button type="primary" size="mini" @click="doAddBatch(scope.row)">编辑</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="类别编码" prop="goodsSpuName" align="center" />
+            <el-table-column label="类别名称" prop="goodsSkuCode" align="center" />
+            <el-table-column label="价格策略" prop="goodsSkuOwnSpec" align="center" />
+            <el-table-column label="策略明细" prop="unit" align="center" width="600" />
+
+          </el-table>
+
+        </el-form>
+
+      </div>
+    </div>
+
+    <!-- 选择商品类别 -->
+    <choosecategory v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState" />
+    <!-- 编辑价格策略 -->
+    <editPriceStrategy v-show="viewState == 3" ref="divSp" @backData="backData" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+  import req from '@/api/storage/adjustment.js'
+  import {
+    getCurrentDate
+  } from '@/utils/index.js'
+  import choosecategory from './relation/choosecategory'
+  import editPriceStrategy from './relation/editPriceStrategy'
+  export default {
+    components: {
+      choosecategory,
+      editPriceStrategy
+    },
+    data() {
+      return {
+        title: "【新增】",
+        viewState:1,
+        listLoading: false,
+        submitdisabled: false,
+        formobj: {
+
+        },
+
+      }
+    },
+    created() {},
+    methods: {
+      backData(value) {
+
+      },
+      resetState() {
+        this.viewState = 1
+      },
+
+      categoryAdd() {
+         this.viewState =2
+      },
+      indexMethod(index) {
+        return index + 1
+      },
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+        for (var i = 0; i < this.formobj.list.length; i++) {
+
+          if (Number(this.formobj.list[i].actualInCount) == 0) {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '商品实收数量不能为空'
+            })
+
+            return
+          }
+
+        }
+
+
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            this.submitdisabled = true
+            req.save(this.formobj).then((res) => {
+              if (res.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: '保存成功'
+                })
+                this.handleReturn('true')
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
+              this.submitdisabled = false
+            })
+          }
+        })
+      },
+      submintdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+
+        for (var i = 0; i < this.formobj.list.length; i++) {
+
+          if (Number(this.formobj.list[i].actualInCount) == 0) {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '商品实收数量不能为空'
+            })
+
+            return
+          }
+
+        }
+
+
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            this.submitdisabled = true
+            req.submit(this.formobj).then((res) => {
+              if (res.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: '保存成功'
+                })
+                this.handleReturn('true')
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
+              this.submitdisabled = false
+            })
+          }
+        })
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.submitdisabled = false
+        this.formobj = {
+
+        }
+        this.$emit('doback')
+      },
+
+      showAdd() {
+
+      },
+      showEdit(row) {
+        var params = {
+          sourceSid: row.sid
+        }
+
+        req.getInitDetails(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+              this.formobj.deliveryDate = getCurrentDate()
+
+              this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
+                .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+              this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+                .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+
+            }
+          })
+          .catch(e => {
+            this.formobj = {}
+          })
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>

yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue

@@ -0,0 +1,155 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>定调价策略申请</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <!-- <div class="title">
+          <div>基础信息</div>
+        </div> -->
+        <el-row class="first_row">
+
+          <el-col :span="8">
+            <div class="span-sty">申请人</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请部门</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请日期</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputw addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="title titleOne">
+          <div>商品类别列表</div>
+          <!-- <el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">添加</el-button> -->
+        </div>
+        <el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
+          <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+          <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table-column label="类别编码" prop="goodsSpuName" align="center" />
+          <el-table-column label="类别名称" prop="goodsSkuCode" align="center" />
+          <el-table-column label="价格策略" prop="goodsSkuOwnSpec" align="center" />
+          <el-table-column label="策略明细" prop="unit" align="center" width="600" />
+
+        </el-table>
+
+      </el-form>
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/storage/adjustment.js'
+  export default {
+    components: {},
+    data() {
+      return {
+        listLoading: false,
+        submitdisabled: false,
+        formobj: {
+
+        },
+
+      }
+    },
+    created() {},
+    methods: {
+
+      indexMethod(index) {
+        return index + 1
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.submitdisabled = false
+        this.formobj = {
+
+        }
+        this.$emit('doback')
+      },
+
+      showAdd() {
+
+      },
+      showEdit(row) {
+        var params = {
+          sourceSid: row.sid
+        }
+
+        req.getInitDetails(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+              this.formobj.deliveryDate = getCurrentDate()
+
+              this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
+                .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+              this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+                .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+
+            }
+          })
+          .catch(e => {
+            this.formobj = {}
+          })
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>

yxt-as-ui/src/views/storage/adjustment/index.vue

@@ -1,8 +1,363 @@
 <template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="定调价策略申请管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.createOrgName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.deptName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="申请日期">
+                <el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                  type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                  type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="办结日期">
+                <el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                  type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                  type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">定调价策略申请列表</div>
+          <!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> -->
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;"
+            @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+            <el-table-column label="操作" width="180" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)"
+                  :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="流程状态" width="180" header-align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
+                <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
+              </template>
+            </el-table-column> -->
+            <el-table-column prop="billNo" label="流程状态" align="center"  />
+            <el-table-column prop="billNo" label="单据编号" align="center"  />
+            <el-table-column prop="useOrgName" label="分公司" align="center"  />
+            <el-table-column prop="deptName" label="申请部门" align="center" />
+            <el-table-column prop="createTime" label="申请日期" align="center" />
+            <el-table-column prop="finishTime" label="办结日期" align="center" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit" />
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+    <!--新增及修改 -->
+    <adjustmentAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState"
+      @reloadlist="getList" />
+    <!-- 详情 -->
+    <adjustmentInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+    <!-- 流程审批记录 -->
+    <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
+      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no"
+        :src="this.centerDialogVisible === true ? url :''"></iframe>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-</script>
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import ButtonBar from '@/components/ButtonBar'
+  import req from '@/api/storage/adjustment.js'
+  import {
+    typeValues
+  } from '@/api/Common/dictcommons'
+  import {
+    getStorage
+  } from '@/utils/auth'
+  import adjustmentAdd from './adjustmentAdd'
+  import adjustmentInfo from './adjustmentInfo'
 
-<style>
+  export default {
-</style>
+    name: 'Procurement',
+    components: {
+      Pagination,
+      pageye,
+      ButtonBar,
+      adjustmentAdd,
+      adjustmentInfo
+    },
+    data() {
+      return {
+        url: '',
+        dialogHeight: '80%',
+        centerDialogVisible: false,
+        btndisabled: false,
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '新增'
+          },
+          {
+            type: 'danger',
+            size: 'small',
+            icon: 'del',
+            btnKey: 'doDel',
+            btnLabel: '删除'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+        tableKey: 0,
+        list: [],
+        sids: [], // 用于导出的时候保存已选择的SIDs
+        billType_list: [],
+        FormLoading: false,
+        listLoading: false,
+        // 翻页
+        listQuery: {
+          current: 1,
+          size: 5,
+          total: 0,
+          params: {
+            createOrgName: '',
+            deptName: '',
+            createByName: '',
+            billNo: '',
+            createStartTime: '',
+            createEndTime: '',
+            finishStartTime: '',
+            finishEndTime: '',
+          }
+        }
+      }
+    },
+    created() {
+      // 初始化变量
+      // this.getList()
+    },
+    mounted() {
+      // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
+      window.addEventListener('message', this.handleMessage)
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    methods: {
+      init() {
+        typeValues({
+          type: 'billType'
+        }).then((res) => {
+          if (res.success) {
+            this.billType_list = res.data
+          }
+        })
+      },
+      async handleMessage(event) {
+        var code = ''
+        if (event.data.params !== null && event.data.params !== undefined) {
+          code = event.data.params.code
+        }
+        if (code === 1) {
+          this.centerDialogVisible = false
+        } else if (code === 2) {
+          this.dialogHeight = event.data.params.data
+          this.setIframeHeight(document.getElementById('iframe'))
+        }
+      },
+      closeIt() {
+        this.url = ''
+        this.centerDialogVisible = false
+      },
+      setIframeHeight(iframe) {
+        iframe.height = this.dialogHeight
+      },
+      flowRecord(row) {
+        this.centerDialogVisible = true
+        var params = {
+          deployId: row.procDefId,
+          procInsId: row.procInstId,
+          token: getStorage()
+        }
+        this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+      },
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'doDel':
+            this.doDel()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      // 信息条数 获取点击时当前的sid
+      handleSelectionChange(row) {
+        const aa = []
+        row.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      // 表中序号
+      indexMethod(index) {
+        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      // 查询列表信息
+      getList() {
+        this.listLoading = true
+        this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        req.listPage(this.listQuery).then((response) => {
+          this.listLoading = false
+          if (response.success) {
+            this.list = response.data.records
+            this.listQuery.total = response.data.total
+          } else {
+            this.list = []
+            this.listQuery.total = 0
+          }
+        })
+      },
+      // 查询按钮
+      handleFilter() {
+        this.listQuery.current = 1
+        this.getList()
+      },
+      // 点击重置
+      handleReset() {
+        this.listQuery = {
+          current: 1,
+          size: 5,
+          total: 0,
+          params: {
+            createOrgName: '',
+            deptName: '',
+            createByName: '',
+            billNo: '',
+            createStartTime: '',
+            createEndTime: '',
+            finishStartTime: '',
+            finishEndTime: '',
+          }
+        }
+        this.init()
+      },
+      toAdd(){
+        this.viewState = 3
+        this.$refs['divAdd'].showAdd()
+      },
+      toEdit(row) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(row)
+      },
+      toInfo(row) {
+        this.viewState = 4
+        this.$refs['divInfo'].showInfo(row)
+      },
+      doDel() {
+        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)'
+          })
+          req.deleteBySids(this.sids).then(resp => {
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+            }
+            this.getList()
+            loading.close()
+          }).catch(e => {
+            loading.close()
+          })
+        }).catch(() => {})
+      },
+      // 修改、编辑、详情返回列表页面
+      resetState() {
+        this.viewState = 1
+      },
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>

yxt-as-ui/src/views/storage/adjustment/relation/choosecategory.vue

@@ -0,0 +1,181 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>选择商品类别</div>
+        <div>
+          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
+              <el-form-item label="类别编码" class="searchlist">
+                <el-input v-model="listQuery.params.code" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="类别名称" class="searchlist">
+                <el-input v-model="listQuery.params.name" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">商品类别列表</div>
+          <!--          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
+             @selection-change="handleSelectionChange">
+            <el-table-column width="50px" type="selection" align="center"/>
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
+          <!--  <el-table-column fixed label="操作" width="100" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">确认</el-button>
+              </template>
+            </el-table-column> -->
+            <el-table-column prop="billNo" label="类别编码" align="center" />
+            <el-table-column prop="billType" label="类别名称" align="center" />
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit" />
+          <!-- 翻页 -->
+          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import Pagination from '@/components/pagination'
+  import {
+    getGoodsCategory
+  } from '@/api/Common/dictcommons'
+
+  export default {
+    name: 'SelectVehicle',
+    components: {
+      Pagination
+    },
+    data() {
+      return {
+        isSearchShow: false,
+        searchxianshitit: '隐藏查询条件',
+        tableKey: 0,
+        sids: [],
+        list: [],
+        number: '',
+        listLoading: false,
+        listQuery: {
+          current: 1,
+          size: 10,
+          params: {
+            code: '',
+            name: '',
+          },
+          total: 0
+        }
+      }
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      indexMethod(index) {
+        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      // 查询列表信息
+      getList() {
+        this.listLoading = true
+        this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+        this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        // this.listQuery.params.menuUrl = this.$route.path
+        this.listQuery.params.menuUrl = ""
+        getGoodsCategory(this.listQuery).then((response) => {
+          this.listLoading = false
+          if (response.success) {
+            this.listQuery.total = response.data.total
+            this.list = response.data.records
+          }
+        })
+      },
+      // 查询按钮
+      handleFilter() {
+        this.listQuery.current = 1
+        this.getList()
+      },
+      // 重置按钮
+      handleReset() {
+        this.listQuery = {
+          current: 1,
+          size: 10,
+          params: {
+           code: '',
+           name: '',
+          },
+          total: 0
+        }
+        this.getList()
+      },
+      handleSelectionChange(row) {
+        this.sids = row
+      },
+      showData(value, createOrgSid) {
+        // const aa = []
+        // if (value.length > 0) {
+        //   for (var i = 0; i < value.length; i++) {
+        //     aa.push(value[i].saleVehSid)
+        //   }
+        //   this.listQuery.params.saleVehSids = aa
+        // } else {
+        //   this.listQuery.params.saleVehSids = []
+        // }``
+        this.listQuery.params.createOrgSid = createOrgSid
+        this.listQuery.current = 1
+        this.listQuery.size = 10
+        this.listQuery.total = 0
+        this.getList()
+      },
+      // 添加修改返回
+      AddUpdateReturn() {
+        if (this.sids.length > 0) {
+          this.$emit('backData', this.sids)
+        } else {
+          this.$notify({
+            title: '提示',
+            message: '请至少选择一条记录进行操作',
+            type: 'error',
+            duration: 2000
+          })
+        }
+      },
+
+      toInfo(row){
+         this.$emit('backData', row.sid)
+      },
+      // 返回
+      handleReturn() {
+        this.$emit('doback')
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>

yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue

@@ -0,0 +1,176 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>价格策略设置</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="info" size="small" @click="saveData()">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <!-- <div class="title">
+         <div>基础信息</div>
+       </div> -->
+        <el-row class="first_row">
+
+          <el-col :span="12">
+            <div class="span-sty">商品类别名称</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="span-sty">价格策略</div>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">加价比例(%)</div>
+            <el-form-item>
+              <el-radio-group v-model="formobj.isLockingSalesPrice" size="small" style="margin-left: 120px;"
+                @change="selectIsLockingSalesPrice">
+                <el-radio :label="'1'">固定比例</el-radio>
+                <el-radio :label="'2'">价格区间</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="title titleOne">
+          <div>价格区间加价策略</div>
+          <el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">添加</el-button>
+        </div>
+        <el-table :data="formobj.list" border style="width: 100%;">
+          <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+          <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
+          <el-table-column fixed label="操作" width="100" align="center">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="toInfo(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+          <!--  <el-table-column label="区间开始" prop="goodsSpuName" align="center" />
+          <el-table-column label="区间截止" prop="goodsSkuCode" align="center" />
+          <el-table-column label="加价比例(%)" prop="goodsSkuOwnSpec" align="center" /> -->
+
+          <el-table-column label="区间开始" align="center">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" v-model="scope.row.rejectReason" clearable placeholder="" />
+            </template>
+          </el-table-column>
+
+          <el-table-column label="区间截止" align="center">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" v-model="scope.row.rejectReason" clearable placeholder="" />
+            </template>
+          </el-table-column>
+
+          <el-table-column label="加价比例(%)" align="center">
+            <template slot-scope="scope">
+              <el-input ref="focusAssumptionInput" v-model="scope.row.rejectReason" clearable placeholder="" />
+            </template>
+          </el-table-column>
+
+
+
+        </el-table>
+
+      </el-form>
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import Pagination from '@/components/pagination'
+  import {
+    getAsBusrepairBill
+  } from '@/api/Common/dictcommons'
+
+  export default {
+    name: 'SelectVehicle',
+    components: {
+      Pagination
+    },
+    data() {
+      return {
+        isSearchShow: false,
+        searchxianshitit: '隐藏查询条件',
+        sids: [],
+       formobj:{}
+      }
+    },
+    methods: {
+      indexMethod(index) {
+        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+
+      // 添加修改返回
+      AddUpdateReturn() {
+        if (this.sids.length > 0) {
+          this.$emit('backData', this.sids)
+        } else {
+          this.$notify({
+            title: '提示',
+            message: '请至少选择一条记录进行操作',
+            type: 'error',
+            duration: 2000
+          })
+        }
+      },
+      showAdd(row){
+        this.formobj = row
+      },
+      // 返回
+      handleReturn() {
+        this.$emit('doback')
+      },
+      selectIsLockingSalesPrice(val){
+
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>

yxt-as-ui/src/views/storage/receivingGoods/index.vue

@@ -25,7 +25,7 @@
               </el-form-item>
               <el-form-item label="业务类型">
                 <el-select v-model="queryParams.params.busTypeKey" placeholder="请选择">
-                  <el-option v-for="(item,i) in busTypeList" :key="i" :label="item.name" :value="item.sid">
+                  <el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -110,6 +110,9 @@
   import divAdd from './receivingGoodsAdd.vue'
   import divInfo from './receivingGoodsInfo.vue'
   import divAddupShelfRecord from './upShelfAddRecord.vue'
+  import {
+    getTypeValueList
+  } from '@/api/Common/dictcommons'
   export default {
     components: {
       ButtonBar,
@@ -202,6 +205,13 @@
     },
     created() {
       this.loadList()
+
+      getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
+        if (res.success) {
+          this.busTypeList = res.data
+        }
+      })
+
     },
     methods: {
       saveExamine() {

yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue

@@ -50,7 +50,7 @@
               <div class="span-sty"><span class="must">*</span> 业务类型</div>
               <el-form-item prop="busTypeValue"><el-select v-model="formobj.busTypeValue" filterable clearable
                   placeholder="请选择" class="addinputInfo" @change="busTypeSelect">
-                  <el-option v-for="item in busTypeList" :key="item.sid" :label="item.name" :value="item.sid">
+                 <el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
                   </el-option>
                 </el-select></el-form-item>
             </el-col>
@@ -277,7 +277,8 @@
   import chooseproducts from './relation/chooseproducts'
   import {
     choiceSupplierInfo,
-    getOrgSidByPath
+    getOrgSidByPath,
+    getTypeValueList
   } from '@/api/Common/dictcommons'
   export default {
     components: {
@@ -315,11 +316,15 @@
         },
         hideUploadBtn: false,
         busTypeList: [{
-            name: "业务类型1",
+            name: "采购预约",
+            sid: "0"
+          },
+          {
+            name: "调拨预约",
             sid: "1"
           },
           {
-            name: "业务类型2",
+            name: "其他预约",
             sid: "2"
           }
         ],
@@ -676,6 +681,12 @@
           this.$refs['form_obj'].clearValidate()
         })
 
+        getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
+          if (res.success) {
+            this.busTypeList = res.data
+          }
+        })
+
 
       },
       showEdit(row) {
@@ -689,6 +700,13 @@
           this.$refs['form_obj'].clearValidate()
         })
 
+        getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
+          if (res.success) {
+            this.busTypeList = res.data
+          }
+        })
+
+
 
         var params = {
           sid: row.sid
@@ -713,10 +731,10 @@
           })
       },
       busTypeSelect(val) {
-        const choose = this.busTypeList.filter((item) => item.sid == val)
+        const choose = this.busTypeList.filter((item) => item.dictKey == val)
         console.log('>>>>>>>>>busTypeSelect', choose)
-        this.formobj.busTypeKey = choose[0].sid
+        this.formobj.busTypeKey = choose[0].dictKey
-        this.formobj.busTypeValue = choose[0].name
+        this.formobj.busTypeValue = choose[0].dictValue
 
       },
       supplierNameSelect(val) {