diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js
index e7c9d3ad71..974eb9a344 100644
--- a/yxt-as-ui/src/api/Common/dictcommons.js
+++ b/yxt-as-ui/src/api/Common/dictcommons.js
@@ -194,7 +194,7 @@ export function getAsBusrepairBill(params) {
 // 查询分页列表 --商品类别列表
 export function getGoodsCategory(params) {
   return request({
-    url: '/as/v1/AsBusrepairBill/listPage',
+    url: '/yxtbase/apiadmin/base/basegoodstype/selectByUseOrgSid',
     method: 'post',
     data: params,
     headers: {
diff --git a/yxt-as-ui/src/api/storage/adjustment.js b/yxt-as-ui/src/api/storage/adjustment.js
index e13a9ad43d..f7837ff9f5 100644
--- a/yxt-as-ui/src/api/storage/adjustment.js
+++ b/yxt-as-ui/src/api/storage/adjustment.js
@@ -5,7 +5,7 @@ export default {
 // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/wms/apiadmin/WmsShelfBill/listPage',
+      url: '/sms/v1/smspricestrategybill/listPage',
       method: 'post',
       data: params,
        headers: { 'Content-Type': 'application/json' }
@@ -15,7 +15,7 @@ export default {
   // 初始化
   init: function(data) {
     return request({
-      url: '/wms/apiadmin/WmsShelfBill/details?sid='+data,
+      url: '/sms/v1/smspricestrategybill/fetchDetailsBySid/'+data,
       method: 'get'
     });
   },
@@ -24,7 +24,17 @@ export default {
   // 新增、保存
   save: function(data) {
     return request({
-      url: '/wms/apiadmin/WmsShelfBill/saveOrUpdate',
+      url: '/sms/v1/smspricestrategybill/save',
+      method: 'post',
+      data: data,
+       headers: { 'Content-Type': 'application/json' }
+    });
+  },
+
+  // 新增、保存
+  submit: function(data) {
+    return request({
+      url: '/sms/v1/smspricestrategybill/submit',
       method: 'post',
       data: data,
        headers: { 'Content-Type': 'application/json' }
@@ -34,7 +44,7 @@ export default {
 
   deleteBySids: function(data) {
     return request({
-      url: '/wms/apiadmin/WmsShelfBill/delBySids',
+      url: '/sms/v1/smspricestrategybill/delBySids',
       method: 'DELETE',
       data: data,
       headers: { 'Content-Type': 'application/json' }
diff --git a/yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue b/yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue
index 3421b499bb..ee3b77b9c1 100644
--- a/yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue
+++ b/yxt-as-ui/src/views/storage/adjustment/adjustmentAdd.vue
@@ -48,19 +48,27 @@
             <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 v-loading="listLoading" :data="formobj.smsPricestrategyBillDetailList" 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>
+                <el-button type="primary" size="mini" @click="deleteGoodsType(scope.row)">删除</el-button>
+                <el-button type="primary" size="mini" @click="editPriceStrategy(scope.row)">编辑</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="类别编码" prop="goodsTypeCode" align="center" />
+            <el-table-column label="类别名称" prop="goodsTypeName" align="center" />
+            <el-table-column label="价格策略" align="center">
+              <template slot-scope="scope">
+                {{calculation(scope.row)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="策略明细" align="center" width="600">
+              <template slot-scope="scope">
+                {{calculation2(scope.row)}}
               </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>
 
@@ -70,9 +78,9 @@
     </div>
 
     <!-- 选择商品类别 -->
-    <choosecategory v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState" />
+    <choosecategory v-show="viewState == 2" ref="choosecategory" @backData="backData" @doback="resetState" />
     <!-- 编辑价格策略 -->
-    <editPriceStrategy v-show="viewState == 3" ref="divSp" @backData="backData" @doback="resetState" />
+    <editPriceStrategy v-show="viewState == 3" ref="editPriceStrategy" @backData2="backData2" @doback="resetState" />
   </div>
 </template>
 
@@ -83,6 +91,9 @@
   } from '@/utils/index.js'
   import choosecategory from './relation/choosecategory'
   import editPriceStrategy from './relation/editPriceStrategy'
+  import {
+    getOrgSidByPath
+  } from '@/api/Common/dictcommons'
   export default {
     components: {
       choosecategory,
@@ -91,18 +102,129 @@
     data() {
       return {
         title: "【新增】",
-        viewState:1,
+        viewState: 1,
         listLoading: false,
         submitdisabled: false,
         formobj: {
-
+          "sid": "",
+          "createByName": window.sessionStorage.getItem('name'),
+          "billNo": "",
+          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
+            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          "remarks": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createTime": getCurrentDate(),
+          "procDefId": "",
+          "nodeId": "",
+          "procInstId": "",
+          "nodeState": "",
+          "taskId": "",
+          "finishTime": "",
+          "useOrgSid": "",
+          "useOrgName": "",
+          "smsPricestrategyBillDetailList": []
         },
 
       }
     },
-    created() {},
+    created() {
+
+    },
     methods: {
+
+      calculation(row) {
+        console.log("calculation》》》》", row)
+        var info = ''
+
+        info = row.strategyType == 0 ? '固定比例' : '价格区间'
+
+        return info
+      },
+      calculation2(row) {
+        var info = ''
+
+        if (row.strategyType == 1) {
+          for (var i = 0; i < row.smsPricestrategyBillGoodstypedetailList.length; i++) {
+
+            info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + row
+              .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + "      " + row
+              .smsPricestrategyBillGoodstypedetailList[i]
+              .markupRate + "；"
+          }
+        } else {
+          info = row.gdMarkupRate
+        }
+
+
+        return info
+      },
+
+      deleteGoodsType(row) {
+
+        const index = this.formobj.smsPricestrategyBillDetailList.findIndex((item) => item === row)
+        console.log("index》》》》", index)
+        this.formobj.smsPricestrategyBillDetailList.splice(index, 1)
+      },
+      editPriceStrategy(row) {
+        this.viewState = 3
+        const aa = []
+        this.$refs['editPriceStrategy'].showAdd(aa, row)
+      },
       backData(value) {
+        this.viewState = 1
+        console.log('>>>>>>>>>backData', value)
+
+        for (var i = 0; i < value.length; i++) {
+
+          this.formobj.smsPricestrategyBillDetailList.push(
+
+            {
+              goodsTypeSid: value[i].sid,
+              goodsTypeCode: value[i].goodsTypeCode,
+              goodsTypeName: value[i].goodsTypeName,
+              strategyType: '',
+              strategyTypeValue: '',
+              gdMarkupRate: "",
+              strategyDetail: '',
+              smsPricestrategyBillGoodstypedetailList: []
+
+            }
+
+          )
+
+        }
+
+      },
+      backData2(value) {
+        this.viewState = 1
+        console.log('>>>>>>>>>backData2', value)
+
+        var info = ''
+
+        if (value.strategyType == 1) {
+          for (var i = 0; i < value.smsPricestrategyBillGoodstypedetailList.length; i++) {
+
+            info += value.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + value
+              .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + "      " + value
+              .smsPricestrategyBillGoodstypedetailList[i]
+              .markupRate + "；"
+          }
+        }
+
+
+        console.log('>>>>>>>>>backData2', info)
+
+        const choose = this.formobj.smsPricestrategyBillDetailList.filter((item) => item.goodsTypeSid == value
+          .goodsTypeSid)
+        console.log('>>>>>>>>>busTypeSelect', choose)
+
+        choose[0].strategyDetail = value.strategyType == 0 ? value.gdMarkupRate : info
+        choose[0].smsPricestrategyBillGoodstypedetailList = value.smsPricestrategyBillGoodstypedetailList
+        choose[0].strategyType = value.strategyType
+        choose[0].strategyTypeValue = value.strategyType == 0 ? '固定比例' : '价格区间'
+        console.log('>>>>>>>>>backData2', choose)
 
       },
       resetState() {
@@ -110,7 +232,9 @@
       },
 
       categoryAdd() {
-         this.viewState =2
+        this.viewState = 2
+        const aa = []
+        this.$refs['choosecategory'].showData(aa, this.formobj.createOrgSid)
       },
       indexMethod(index) {
         return index + 1
@@ -118,20 +242,6 @@
       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) {
@@ -156,19 +266,13 @@
       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
-          }
-
+        if (this.formobj.smsPricestrategyBillDetailList.length == 0) {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: '请添加商品类别'
+          })
+          return
         }
 
 
@@ -202,24 +306,24 @@
       },
 
       showAdd() {
-
+        this.title = '【新增】'
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.formobj.createOrgSid = res.data
+            this.formobj.useOrgSid = res.data
+          }
+        })
       },
       showEdit(row) {
-        var params = {
-          sourceSid: row.sid
-        }
 
-        req.getInitDetails(row.sid)
+        this.title = '【编辑】'
+
+        req.init(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 => {
diff --git a/yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue b/yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue
index 5723181132..1e1c24a81f 100644
--- a/yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue
+++ b/yxt-as-ui/src/views/storage/adjustment/adjustmentInfo.vue
@@ -37,7 +37,7 @@
         <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-form-item><span class="addinputw addinputInfo">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
         </el-row>
 
@@ -45,13 +45,21 @@
           <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 v-loading="listLoading" :data="formobj.smsPricestrategyBillDetailList" 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-column label="类别编码" prop="goodsTypeCode" align="center" />
+          <el-table-column label="类别名称" prop="goodsTypeName" align="center" />
+          <el-table-column label="价格策略" align="center">
+            <template slot-scope="scope">
+              {{calculation(scope.row)}}
+            </template>
+          </el-table-column>
+          <el-table-column label="策略明细" align="center" width="600">
+            <template slot-scope="scope">
+              {{calculation2(scope.row)}}
+            </template>
+          </el-table-column>
 
         </el-table>
 
@@ -78,6 +86,30 @@
     created() {},
     methods: {
 
+      calculation(row) {
+        var info = ''
+        info = row.strategyType == 0 ? '固定比例' : '价格区间'
+        return info
+      },
+      calculation2(row) {
+        var info = ''
+
+        if (row.smsPricestrategyBillGoodstypedetailList != null && row.smsPricestrategyBillGoodstypedetailList.length >
+          0) {
+          for (var i = 0; i < row.smsPricestrategyBillGoodstypedetailList.length; i++) {
+
+            info += row.smsPricestrategyBillGoodstypedetailList[i].rangeStart + "——" + row
+              .smsPricestrategyBillGoodstypedetailList[i].rangeEnd + "      " + row
+              .smsPricestrategyBillGoodstypedetailList[i]
+              .markupRate + "；"
+          }
+        }else{
+          info = row.gdMarkupRate
+        }
+
+
+        return info
+      },
       indexMethod(index) {
         return index + 1
       },
@@ -94,21 +126,12 @@
       showAdd() {
 
       },
-      showEdit(row) {
-        var params = {
-          sourceSid: row.sid
-        }
+      showInfo(row) {
 
-        req.getInitDetails(row.sid)
+        req.init(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)
 
             }
           })
diff --git a/yxt-as-ui/src/views/storage/adjustment/index.vue b/yxt-as-ui/src/views/storage/adjustment/index.vue
index 32668945f7..a9201809e0 100644
--- a/yxt-as-ui/src/views/storage/adjustment/index.vue
+++ b/yxt-as-ui/src/views/storage/adjustment/index.vue
@@ -66,7 +66,7 @@
                 <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="nodeState" 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" />
@@ -177,7 +177,7 @@
     },
     created() {
       // 初始化变量
-      // this.getList()
+      this.getList()
     },
     mounted() {
       // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
diff --git a/yxt-as-ui/src/views/storage/adjustment/relation/choosecategory.vue b/yxt-as-ui/src/views/storage/adjustment/relation/choosecategory.vue
index 4ab047bd68..8aff066ba6 100644
--- a/yxt-as-ui/src/views/storage/adjustment/relation/choosecategory.vue
+++ b/yxt-as-ui/src/views/storage/adjustment/relation/choosecategory.vue
@@ -40,8 +40,8 @@
                 <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-column prop="goodsTypeCode" label="类别编码" align="center" />
+            <el-table-column prop="goodsTypeName" label="类别名称" align="center" />
           </el-table>
         </div>
         <div class="pages">
@@ -81,6 +81,8 @@
           params: {
             code: '',
             name: '',
+            deptSid:window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+             .getItem('defaultOrgPath').lastIndexOf('/') + 1)
           },
           total: 0
         }
@@ -129,6 +131,8 @@
           params: {
            code: '',
            name: '',
+           deptSid:window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1)
           },
           total: 0
         }
@@ -147,7 +151,6 @@
         // } else {
         //   this.listQuery.params.saleVehSids = []
         // }``
-        this.listQuery.params.createOrgSid = createOrgSid
         this.listQuery.current = 1
         this.listQuery.size = 10
         this.listQuery.total = 0
diff --git a/yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue b/yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue
index 4fb2dd5993..e156612395 100644
--- a/yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue
+++ b/yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue
@@ -6,7 +6,7 @@
       <div>价格策略设置</div>
       <!-- start 添加修改按钮 -->
       <div>
-        <el-button type="info" size="small" @click="saveData()">保存</el-button>
+        <el-button type="primary" size="small" @click="saveData()">保存</el-button>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
       <!-- end 添加修改按钮 -->
@@ -15,7 +15,7 @@
 
     <div class="listconadd">
 
-      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <!-- <div class="title">
          <div>基础信息</div>
        </div> -->
@@ -23,37 +23,40 @@
 
           <el-col :span="12">
             <div class="span-sty">商品类别名称</div>
-            <el-form-item><span class="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            <el-form-item><span class="addinputw addinputInfo">{{ formobj.goodsTypeName }}</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>
+            <div class="span-sty"><span class="must">*</span> 价格策略</div>
+            <el-form-item prop="strategyType">
+              <el-radio-group v-model="formobj.strategyType" size="small" style="margin-left: 120px;"
+                @change="selectIsLockingSalesPrice">
+                <el-radio :label="0">固定比例</el-radio>
+                <el-radio :label="1">价格区间</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </el-col>
         </el-row>
-
-        <el-row>
+        <el-row v-show="formobj.strategyType==0">
           <el-col :span="24">
-            <div class="span-sty">加价比例(%)</div>
+            <div class="span-sty"><span class="must">*</span> 加价比例(%)</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-input v-model="formobj.gdMarkupRate" placeholder="" class="addinputw addinputInfo" clearable @input="gdMarkupRateInput"
+                oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
             </el-form-item>
           </el-col>
         </el-row>
 
-        <div class="title titleOne">
+        <div class="title titleOne" v-show="formobj.strategyType==1">
           <div>价格区间加价策略</div>
-          <el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">添加</el-button>
+          <el-button type="primary" size="mini" class="btntopblueline" @click="addItem()">添加</el-button>
         </div>
-        <el-table :data="formobj.list" border style="width: 100%;">
+        <el-table :data="formobj.smsPricestrategyBillGoodstypedetailList" border style="width: 100%;"
+          v-show="formobj.strategyType==1">
           <!-- <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>
+              <el-button type="primary" size="mini" @click="deleteItem(scope.row)">删除</el-button>
             </template>
           </el-table-column>
           <!--  <el-table-column label="区间开始" prop="goodsSpuName" align="center" />
@@ -62,19 +65,25 @@
 
           <el-table-column label="区间开始" align="center">
             <template slot-scope="scope">
-              <el-input ref="focusAssumptionInput" v-model="scope.row.rejectReason" clearable placeholder="" />
+              <el-input ref="focusAssumptionInput" v-model="scope.row.rangeStart" clearable placeholder=""
+              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+
             </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="" />
+              <el-input ref="focusAssumptionInput" v-model="scope.row.rangeEnd" clearable placeholder=""
+              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+
             </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="" />
+              <el-input ref="focusAssumptionInput" v-model="scope.row.markupRate" clearable placeholder=""
+              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+
             </template>
           </el-table-column>
 
@@ -103,39 +112,152 @@
       return {
         isSearchShow: false,
         searchxianshitit: '隐藏查询条件',
-        sids: [],
-       formobj:{}
+        formobj: {
+          goodsTypeName: "",
+          strategyType: '',
+          gdMarkupRate: "",
+          smsPricestrategyBillGoodstypedetailList: []
+        },
+        rules: {
+          strategyType: [{
+            required: true,
+            message: '请选择价格策略',
+            trigger: 'change'
+          }],
+          gdMarkupRate: [{
+            required: true,
+            message: '加价比例不能为空',
+            trigger: 'blur'
+          }],
+        }
       }
     },
     methods: {
+      gdMarkupRateInput(val){
+          console.log("gdMarkupRateInput》》》》", val)
+          console.log("gdMarkupRateInput》》》》", this.formobj.gdMarkupRate)
+      },
       indexMethod(index) {
-        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
+        return index + 1
       },
 
       // 添加修改返回
-      AddUpdateReturn() {
-        if (this.sids.length > 0) {
-          this.$emit('backData', this.sids)
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '请至少选择一条记录进行操作',
-            type: 'error',
-            duration: 2000
-          })
+      saveData() {
+
+
+        if (this.formobj.strategyType == 0) {
+
+          if (this.formobj.gdMarkupRate == '') {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '加价比例不能为空222'
+            })
+
+            return
+          }
         }
+
+        if (this.formobj.strategyType == 1) {
+
+          if (this.formobj.smsPricestrategyBillGoodstypedetailList == 0) {
+            this.$message({
+              showClose: true,
+              type: 'error',
+              message: '请添加价格区间加价策略'
+            })
+
+            return
+          }
+
+
+          for (var i = 0; i < this.formobj.smsPricestrategyBillGoodstypedetailList.length; i++) {
+
+            var item = this.formobj.smsPricestrategyBillGoodstypedetailList[i]
+
+            if (item.rangeStart == '') {
+              this.$message({
+                showClose: true,
+                type: 'error',
+                message: '区间开始不能为空'
+              })
+
+              return
+            }
+
+            if (item.rangeEnd == '') {
+              this.$message({
+                showClose: true,
+                type: 'error',
+                message: '区间结束不能为空'
+              })
+
+              return
+            }
+
+            if (item.markupRate == '') {
+              this.$message({
+                showClose: true,
+                type: 'error',
+                message: '加价比例不能为空'
+              })
+
+              return
+            }
+
+          }
+        }
+
+
+
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            this.$emit('backData2', this.formobj)
+            this.formobj = {
+              goodsTypeName: "",
+              strategyType: '',
+              gdMarkupRate: "",
+              smsPricestrategyBillGoodstypedetailList: []
+            }
+          }
+        })
+
+
       },
-      showAdd(row){
+      showAdd(value, row) {
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+
+        console.log("showAdd》》》》", row)
         this.formobj = row
       },
       // 返回
       handleReturn() {
         this.$emit('doback')
+        this.formobj = {
+          goodsTypeName: "",
+          strategyType: '',
+          gdMarkupRate: "",
+          smsPricestrategyBillGoodstypedetailList: []
+        }
       },
-      selectIsLockingSalesPrice(val){
-
+      selectIsLockingSalesPrice(val) {
+        console.log("selectIsLockingSalesPrice》》》》", val)
+        this.formobj.strategyType = val
+        console.log("selectIsLockingSalesPrice》》》》", this.formobj.strategyType)
+      },
+      addItem() {
+        this.formobj.smsPricestrategyBillGoodstypedetailList.push({
+          rangeStart: "",
+          rangeEnd: "",
+          markupRate: "",
+        })
+      },
+      deleteItem(row) {
+        const index = this.formobj.smsPricestrategyBillGoodstypedetailList.findIndex((item) => item === row)
+        console.log("index》》》》", index)
+        this.formobj.smsPricestrategyBillGoodstypedetailList.splice(index, 1)
       }
     }
   }
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/index.vue b/yxt-as-ui/src/views/storage/receivingGoods/index.vue
index d00d1218dd..21de65a333 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/index.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/index.vue
@@ -175,18 +175,7 @@
         },
         sids: [],
         selectionList: [],
-        busTypeList: [{
-            name: "采购预约",
-            sid: "0"
-          },
-          {
-            name: "调拨预约",
-            sid: "1"
-          },
-          {
-            name: "其他预约",
-            sid: "2"
-          }
+        busTypeList: [
         ],
         billStateList: [{
             name: "新建",