From a6068d98c7391ffbd8e5b435433f559e1edd95bc Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Wed, 8 May 2024 14:34:13 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/api/Common/Upload.js            |    2 +-
 yxt-as-ui/src/api/goods/unit.js               |    2 +-
 .../src/views/goods/brands/brandsAdd.vue      |   36 +-
 yxt-as-ui/src/views/goods/goods/goodsAdd.vue  | 1085 ++++++++---------
 yxt-as-ui/src/views/goods/goods/goodsInfo.vue |  976 +++++----------
 yxt-as-ui/src/views/goods/goods/index.vue     |    6 +-
 6 files changed, 829 insertions(+), 1278 deletions(-)

diff --git a/yxt-as-ui/src/api/Common/Upload.js b/yxt-as-ui/src/api/Common/Upload.js
index 6f5f0c578a..2a3a89c243 100644
--- a/yxt-as-ui/src/api/Common/Upload.js
+++ b/yxt-as-ui/src/api/Common/Upload.js
@@ -1,4 +1,4 @@
 import request from '@/utils/request'
 // 上传图片
 
-export const uploadFile = '/api/riskcenter/file/upload'
+export const uploadFile = '/api/portal/file/upload'
diff --git a/yxt-as-ui/src/api/goods/unit.js b/yxt-as-ui/src/api/goods/unit.js
index 8795c0b363..732f5d9f27 100644
--- a/yxt-as-ui/src/api/goods/unit.js
+++ b/yxt-as-ui/src/api/goods/unit.js
@@ -46,7 +46,7 @@ export default {
   // 初始化
   initUnits: function(data) {
     return request({
-      url: '/base/basegoodsunit/initialization/' + data,
+      url: '/yxtbase/apiadmin/base/basegoodsunit/initialization/' + data,
       method: 'get'
     });
   },
diff --git a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue
index 75c4756677..79f461d2c9 100644
--- a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue
+++ b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue
@@ -54,11 +54,11 @@
         </div> -->
         <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
           <span class="item_text">品牌Logo：</span>
-      <!--    <upload ref="uploadImg" v-model="imgList" style="" class="item_input" :limit="1"
+          <!--    <upload ref="uploadImg" v-model="imgList" style="" class="item_input" :limit="1"
             bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }" @change="backData" />
             -->
-            <upload-img ref="uploadImg" class="item_input" v-model="formobj.image" :limit="50" bucket="map"
-              :upload-data="{ type: '0001' }" />
+          <upload-img ref="uploadImg" class="item_input" v-model="imgList" :limit="1" bucket="map"
+            :upload-data="{ type: '0001' }" :class="{ hide: hideUploadBtn }"  @change="backData" />
 
         </div>
 
@@ -98,8 +98,8 @@
       // this.initData()
     },
     methods: {
-      backData(value) {
-        console.log('backData》》》》', value)
+
+      backData(value){
         console.log('imgList', this.imgList)
 
         if (this.imgList.length > 0) {
@@ -107,25 +107,13 @@
         } else {
           this.formobj.image = ''
         }
-
         this.hideUploadBtn = this.imgList.length != 0
         console.log('this.hideUploadBtn', this.hideUploadBtn)
       },
-      backData2(value) {
-        console.log('backData2》》》》', value)
-        console.log('imgList2', this.imgList2)
-
-        if (this.imgList2.length > 0) {
-          this.formobj.bigPic = this.imgList2[0].url
-        } else {
-          this.formobj.bigPic = ''
-        }
 
-        this.hideUploadBtn2 = this.imgList2.length != 0
-        console.log('this.hideUploadBtn2', this.hideUploadBtn2)
-      },
       saveOrUpdate() {
         console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
         req.saveBrands(this.formobj)
           .then(resp => {
             if (resp.success) {
@@ -144,9 +132,7 @@
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
         this.imgList = []
-        this.imgList2 = []
         this.hideUploadBtn = true
-        this.hideUploadBtn2 = true
         this.formobj = {
           sid: '',
           brandName: '',
@@ -159,9 +145,7 @@
       },
       showAdd() {
         console.log("this.imgList", this.imgList)
-        console.log("this.imgList2", this.imgList2)
         this.hideUploadBtn = this.imgList.length != 0
-        this.hideUploadBtn2 = this.imgList2.length != 0
       },
       showEdit(row) {
         req.initBrands(row.sid)
@@ -169,26 +153,18 @@
             if (resp.success) {
               this.formobj = resp.data
               this.imgList = []
-              this.imgList2 = []
               if (resp.data.image != '') {
                 this.imgList.push({
                   url: resp.data.image
                 })
               }
-              if (resp.data.bigPic != '') {
-                this.imgList2.push({
-                  url: resp.data.bigPic
-                })
-              }
 
               this.hideUploadBtn = this.imgList.length != 0
-              this.hideUploadBtn2 = this.imgList2.length != 0
             }
           })
           .catch(e => {
             this.formobj = row
             this.imgList = []
-            this.imgList2 = []
           })
       },
 
diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue
index d2bb507b42..70f7dceb86 100644
--- a/yxt-as-ui/src/views/goods/goods/goodsAdd.vue
+++ b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue
@@ -15,241 +15,329 @@
 
     <div class="listconadd">
 
-      <el-form ref="dataForm" :model="formobj" label-position="top" label-width="190px" class="formadd">
-        <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <div class="title">
           <div>基础信息</div>
         </div>
         <el-row class="first_row">
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品名称</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品名称</div>
+            <el-form-item>
+              <el-input v-model="formobj.goodsName" placeholder="商品名称" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.goodsName" placeholder="商品名称" class="addinputw" style="width:100%" clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">商品简称</div>
+            <el-form-item>
+              <el-input v-model="formobj.goodsShortName" placeholder="商品简称" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品编码</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品副标题</div>
+            <el-form-item>
+              <el-input v-model="formobj.subTitle" placeholder="商品副标题" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.barCode" placeholder="商品编码" style="width: 100%;" class="addinputw" clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">商品拼音缩写</div>
+            <el-form-item>
+              <el-input v-model="formobj.goodsPY" placeholder="由系统生成" :readonly="true" class="addinputw addinputInfo"
+                clearable />
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品品牌</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品编码</div>
+            <el-form-item>
+              <el-input v-model="formobj.goodsCode" placeholder="商品编码" class="addinputw addinputInfo" clearable />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <div class="span-sty">商品条形码</div>
+            <el-form-item>
+              <el-input v-model="formobj.barCode" placeholder="由系统生成" :readonly="true" class="addinputw addinputInfo"
+                clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-select v-model="formobj.brandName" placeholder="请选择商品品牌" class="addinputw" style="width: 100%;"
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品品牌</div>
+            <el-form-item>
+              <el-select v-model="formobj.brandName" placeholder="请选择商品品牌" class="addinputw"
                 @change="selectBrandChange">
                 <el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品类别</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-select v-model="formobj.typeName" placeholder="请选择商品类别" class="addinputw" style="width: 100%;"
-                @change="selectCateChange">
+
+          <el-col :span="12">
+            <div class="span-sty">商品类别</div>
+            <el-form-item>
+              <el-select v-model="formobj.typeName" placeholder="请选择商品类别" class="addinputw" @change="selectCateChange">
                 <el-option v-for="item in cateList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
               </el-select>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品厂家</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-select v-model="formobj.manufacturerName" placeholder="请选择商品厂家" class="addinputw" style="width: 100%;"
+
+          <el-col :span="12">
+            <div class="span-sty">商品厂家</div>
+            <el-form-item>
+              <el-select v-model="formobj.manufacturerName" placeholder="请选择商品厂家" class="addinputw"
                 @change="selectfacturerChange">
                 <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName"
                   :value="item.sid" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">厂家货号</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.factoryCode" placeholder="商品名称" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">厂家货号</div>
+            <el-form-item>
+              <el-input v-model="formobj.factoryCode" placeholder="厂家货号" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">外部编码</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品单位</div>
+            <el-form-item>
+              <el-select v-model="formobj.goodsUnitName" placeholder="请选择商品单位" class="addinputw"
+                @change="selectunitNameChange">
+                <el-option v-for="item in unitNameList" :key="item.sid" :label="item.unitName" :value="item.sid" />
+              </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.externalCode" placeholder="外部编码" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">是否上架</div>
+            <el-form-item>
+              <el-radio-group v-model="formobj.isListed" size="small" class="addinputw">
+                <el-radio :label="'1'">上架</el-radio>
+                <el-radio :label="'2'">下架</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">国标码</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">外部编码</div>
+            <el-form-item>
+              <el-input v-model="formobj.externalCode" placeholder="外部编码" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.nationalStandardCode" placeholder="国标码" style="width: 100%;" class="addinputw"
+
+          <el-col :span="12">
+            <div class="span-sty">国标码</div>
+            <el-form-item>
+              <el-input v-model="formobj.nationalStandardCode" placeholder="国标码" class="addinputw addinputInfo"
                 clearable />
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">税率</span>
+
+          <el-col :span="12">
+            <div class="span-sty">税率</div>
+            <el-form-item>
+              <el-input v-model="formobj.taxRate" placeholder="税率" class="addinputw addinputInfo" clearable
+                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-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.taxRate" placeholder="税率" style="width: 100%;" class="addinputw" clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">保质期天</div>
+            <el-form-item>
+              <el-input v-model="formobj.shelfLife" placeholder="保质期天" class="addinputw addinputInfo" clearable
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">保质期天</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品排序</div>
+            <el-form-item>
+              <el-input v-model="formobj.sortNo" placeholder="商品排序" class="addinputw addinputInfo" clearable
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.shelfLife" placeholder="保质期天" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">商品备注</div>
+            <el-form-item>
+              <el-input v-model="formobj.remarks" placeholder="商品备注" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品详细说明</span>
+
+          <el-col :span="24">
+            <div class="span-sty">商品详细说明</div>
+            <el-form-item>
+              <el-input v-model="formobj.baseGoodsSpuDetail.goodsExplain" placeholder="商品详细说明" type="textarea" :rows="4"
+                class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="20">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.baseGoodsSpuDetail.goodsExplain" type="textarea" :rows="4"
-                style="width: 100%;margin-bottom: 5px;;" placeholder="商品详细说明" class="addinputw" clearable />
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">商品描述</div>
+            <el-form-item>
+              <el-input v-model="formobj.baseGoodsSpuDetail.goodsDescription" placeholder="商品描述" type="textarea"
+                :rows="4" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品描述</span>
+
+          <el-col :span="24">
+            <div class="span-sty">商品通用规格参数</div>
+            <el-form-item>
+              <el-input v-model="formobj.baseGoodsSpuDetail.genericSpec" placeholder="商品通用规格参数" type="textarea"
+                :rows="4" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="20">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.baseGoodsSpuDetail.goodsDescription" type="textarea" :rows="4"
-                style="width: 100%;margin-bottom: 5px;;" placeholder="商品描述" class="addinputw" clearable />
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">商品特有规格参数</div>
+            <el-form-item>
+              <el-input v-model="formobj.baseGoodsSpuDetail.specialSpec" placeholder="商品特有规格参数" type="textarea"
+                :rows="4" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
+
         </el-row>
 
-        <el-collapse v-model="activeNames" style="margin-top: 20px;">
-          <el-collapse-item name="1">
-            <template slot="title">
-              规格列表<span class="span" @click.stop="addGoodsSku()">添加</span>
+        <div class="title titleOne">
+          <div>规格列表</div>
+          <el-button type="primary" size="mini" class="btntopblueline" @click="addGoodsSku()">添加</el-button>
+        </div>
+        <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border>
+          <!-- <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="操作" wid align="center" width="120">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="editGoodsSku(scope.row)">编辑</el-button>
             </template>
-            <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border style="width: 100%;"
-              :row-style="{height: '40px'}">
-              <!-- <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="操作" wid align="center" width="120">
-                <template slot-scope="scope">
-                  <el-button type="primary" size="mini" @click="editGoodsSku(scope.row)">编辑</el-button>
-                </template>
-              </el-table-column>
-              <el-table-column label="是否可用" align="center" width="200">
-                <template slot-scope="scope">
-                  <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
-                    inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
-                </template>
-              </el-table-column>
-              <el-table-column label="规格代码" prop="goodsSkuCode" align="center" />
-              <el-table-column label="标题" prop="title" align="center" />
-              <el-table-column label="外部编码" prop="externalCode" align="center" />
-              <el-table-column label="规格明细" wid align="center" width="250">
-                <template slot-scope="scope">
-                  <el-button type="primary" size="mini"
-                    @click="showGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">查看</el-button>
-                  <el-button type="primary" size="mini"
-                    @click="editGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">编辑</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-
-          </el-collapse-item>
-        </el-collapse>
+          </el-table-column>
+          <el-table-column label="是否可用" align="center" width="200">
+            <template slot-scope="scope">
+              <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
+                inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
+            </template>
+          </el-table-column>
+          <el-table-column label="规格代码" prop="goodsSkuCode" align="center" />
+          <el-table-column label="商品标题" prop="title" align="center" />
+          <el-table-column label="外部编码" prop="externalCode" align="center" />
+          <el-table-column label="特有规格属性" prop="indexes" align="center" />
+          <el-table-column label="特有规格参数" prop="ownSpec" align="center" />
+          <el-table-column label="规格明细" wid align="center" width="250">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini"
+                @click="showGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">查看</el-button>
+              <el-button type="primary" size="mini"
+                @click="editGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">编辑</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
 
       </el-form>
 
       <el-dialog title="编辑规格" :visible.sync="dialogVisible3" :before-close="handleClose3">
-        <el-form ref="dataForm2" class="formadd" style="margin-top: -40px;" :model="orderInfo">
+
+        <el-form ref="dataForm2" class="formaddcopy02" style="margin-top: -40px;" :model="orderInfo">
+
           <el-row class="first_row">
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">规格代码</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.finalPurchasePrice}}</span> -->
-                <el-input v-model="orderInfo.goodsSkuCode" placeholder="规格代码" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">规格代码</div>
+              <el-form-item>
+                <el-input v-model="orderInfo.goodsSkuCode" placeholder="规格代码" class="addinputw addinputInfo"
+                  clearable />
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">规格标题</span>
+
+            <el-col :span="8">
+              <div class="span-sty">商品标题</div>
+              <el-form-item>
+                <el-input v-model="orderInfo.title" placeholder="商品标题" class="addinputw addinputInfo" clearable />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.safetyStockDays}}</span> -->
-                <el-input v-model="orderInfo.title" placeholder="规格标题" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">外部编码</div>
+              <el-form-item>
+                <el-input v-model="orderInfo.externalCode" placeholder="外部编码" class="addinputw addinputInfo"
+                  clearable />
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">外部编码</span>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="24">
+              <div class="span-sty">特有规格属性</div>
+              <el-form-item>
+                <el-input v-model="orderInfo.indexes" placeholder="特有规格属性" type="textarea" :rows="4"
+                  class="addinputw addinputInfo" clearable />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.isOriginalFactory}}</span> -->
-                <el-input v-model="orderInfo.externalCode" placeholder="外部编码" clearable />
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="24">
+              <div class="span-sty">特有规格参数</div>
+              <el-form-item>
+                <el-input v-model="orderInfo.ownSpec" placeholder="特有规格参数" type="textarea" :rows="4"
+                  class="addinputw addinputInfo" clearable />
               </el-form-item>
             </el-col>
+
           </el-row>
 
         </el-form>
@@ -262,184 +350,179 @@
       </el-dialog>
 
 
-
       <el-dialog title="查看规格明细" :visible.sync="dialogVisible" :before-close="handleClose">
-        <el-form ref="dataForm1" class="formadd" style="margin-top: -40px;" :model="itemInfo">
+
+        <el-form ref="dataForm1" class="formaddcopy02" style="margin-top: -40px;" :model="itemInfo">
 
           <el-row class="first_row">
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最后采购价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.finalPurchasePrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">安全库存天数</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.safetyStockDays}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">最后采购价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.finalPurchasePrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否原厂</span>
+
+            <el-col :span="8">
+              <div class="span-sty">安全库存天数</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.safetyStockDays}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isOriginalFactory}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否原厂</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isOriginalFactory" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否库存警戒</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isInventoryAlert}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒上线</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.inventoryAlertUpperLimit}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否库存警戒</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isInventoryAlert" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒下线</span>
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒上线</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.inventoryAlertUpperLimit}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.inventoryAlertLowerLimit}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒下线</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.inventoryAlertLowerLimit}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">成本价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.costPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">吊牌价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.tagPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">成本价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.costPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">销售单价</span>
+
+            <el-col :span="8">
+              <div class="span-sty">吊牌价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.tagPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.salesPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">销售单价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.salesPrice}}</span>
               </el-form-item>
             </el-col>
+
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">标准进价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.standardPurchasePrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">代理价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.agencyPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">标准进价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.standardPurchasePrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">折扣</span>
+
+            <el-col :span="8">
+              <div class="span-sty">代理价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.agencyPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.discount}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">折扣</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.discount}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
+
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最低零售价</span>
+
+            <el-col :span="8">
+              <div class="span-sty">最低零售价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.minimumSalesPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.minimumSalesPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否积分兑换</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isIntegralExchange" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否积分兑换</span>
+
+            <el-col :span="8">
+              <div class="span-sty">积分数量</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.integralAmount}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isIntegralExchange}}</span>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">锁定销售价格</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">积分数量</span>
+
+            <el-col :span="8">
+              <div class="span-sty">排序</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.sortNo}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.integralAmount}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.remarks}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">规格图片</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="20">
-              <el-form-item class="trightb_item">
+            <el-col :span="24">
+              <div class="span-sty">规格图片</div>
+              <el-form-item>
                 <template slot-scope="scope">
-                  <span v-for="(item,index) in itemInfo.urls" :key="index">
+                  <span v-for="(item,index) in itemInfo.urls" :key="index" class="addinputInfo">
                     <el-popover placement="left" trigger="click" width="300">
                       <img :src="item.url" width="100%" />
                       <img slot="reference" :src="item.url" :alt="item.url"
@@ -459,274 +542,205 @@
       </el-dialog>
 
 
-
       <el-dialog title="编辑规格明细" :visible.sync="dialogVisible2" :before-close="handleClose2">
-        <el-form ref="dataForm2" class="formadd" style="margin-top: -40px;" :model="itemInfo">
+        <el-form ref="dataForm2" class="formaddcopy02" style="margin-top: -40px;" :model="itemInfo">
+
           <el-row class="first_row">
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最后采购价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.finalPurchasePrice}}</span> -->
-                <el-input v-model="itemInfo.finalPurchasePrice" placeholder="最后采购价" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">安全库存天数</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.safetyStockDays}}</span> -->
-                <el-input v-model="itemInfo.safetyStockDays" placeholder="安全库存天数" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">最后采购价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.finalPurchasePrice" placeholder="最后采购价" clearable
+                  class="addinputw addinputInfo"
+                  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-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否原厂</span>
+
+            <el-col :span="8">
+              <div class="span-sty">安全库存天数</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.safetyStockDays" placeholder="安全库存天数" clearable
+                  class="addinputw addinputInfo" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.isOriginalFactory}}</span> -->
-                <el-input v-model="itemInfo.isOriginalFactory" placeholder="是否原厂" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">是否原厂</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isOriginalFactory" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否库存警戒</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.isInventoryAlert}}</span> -->
-                <el-input v-model="itemInfo.isInventoryAlert" placeholder="是否库存警戒" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒上线</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.inventoryAlertUpperLimit}}</span> -->
-                <el-input v-model="itemInfo.inventoryAlertUpperLimit" placeholder="库存警戒上线" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">是否库存警戒</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isInventoryAlert" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒下线</span>
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒上线</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.inventoryAlertUpperLimit" placeholder="库存警戒上线" clearable
+                  class="addinputw addinputInfo" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.inventoryAlertLowerLimit}}</span> -->
-                <el-input v-model="itemInfo.inventoryAlertLowerLimit" placeholder="库存警戒下线" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒下线</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.inventoryAlertLowerLimit" placeholder="库存警戒下线" clearable
+                  class="addinputw addinputInfo" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">成本价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.costPrice}}</span> -->
-                <el-input v-model="itemInfo.costPrice" placeholder="成本价" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">吊牌价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.tagPrice}}</span> -->
-                <el-input v-model="itemInfo.tagPrice" placeholder="吊牌价" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">成本价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.costPrice" placeholder="成本价" clearable class="addinputw addinputInfo"
+                  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-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">销售单价</span>
+
+            <el-col :span="8">
+              <div class="span-sty">吊牌价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.tagPrice" placeholder="吊牌价" clearable class="addinputw addinputInfo"
+                  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-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.salesPrice}}</span> -->
-                <el-input v-model="itemInfo.salesPrice" placeholder="销售单价" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">销售单价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.salesPrice" placeholder="销售单价" clearable class="addinputw addinputInfo"
+                  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>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">标准进价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.standardPurchasePrice}}</span> -->
-                <el-input v-model="itemInfo.standardPurchasePrice" placeholder="标准进价" clearable />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">代理价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.agencyPrice}}</span> -->
-                <el-input v-model="itemInfo.agencyPrice" placeholder="代理价" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">标准进价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.standardPurchasePrice" placeholder="标准进价" clearable
+                  class="addinputw addinputInfo"
+                  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-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">折扣</span>
+
+            <el-col :span="8">
+              <div class="span-sty">代理价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.agencyPrice" placeholder="代理价" clearable class="addinputw addinputInfo"
+                  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-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.discount}}</span> -->
-                <el-input v-model="itemInfo.discount" placeholder="折扣" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">折扣</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.discount" placeholder="折扣" clearable class="addinputw addinputInfo"
+                  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>
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最低零售价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.minimumSalesPrice}}</span> -->
-                <el-input v-model="itemInfo.minimumSalesPrice" placeholder="最低零售价" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">最低零售价</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.minimumSalesPrice" placeholder="最低零售价" clearable
+                  class="addinputw addinputInfo"
+                  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-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否积分兑换</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否积分兑换</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isIntegralExchange" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.isIntegralExchange}}</span> -->
-                <el-input v-model="itemInfo.isIntegralExchange" placeholder="是否积分兑换" clearable />
+
+            <el-col :span="8">
+              <div class="span-sty">积分数量</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.integralAmount" placeholder="积分数量" clearable class="addinputw addinputInfo"
+                  oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">积分数量</span>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">锁定销售价格</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isLockingSalesPrice" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <!-- <span slot="label">{{itemInfo.integralAmount}}</span> -->
-                <el-input v-model="itemInfo.integralAmount" placeholder="积分数量" clearable />
+
+
+            <el-col :span="8">
+              <div class="span-sty">排序</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.sortNo" placeholder="排序" clearable class="addinputw addinputInfo"
+                  oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
               </el-form-item>
             </el-col>
-          </el-row>
 
-          <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">规格图片</span>
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item>
+                <el-input v-model="itemInfo.remarks" placeholder="备注" clearable class="addinputw addinputInfo" />
               </el-form-item>
             </el-col>
-            <el-col :span="20">
-              <el-form-item class="trightb_item">
-               <!-- <upload ref="uploadImg2" v-model="imgList" style="margin-top: 20px; z-index: 1000;" class="item_input"
-                  :limit="9" bucket="map" :class="{ hide: false }" :upload-data="{ type: '0001' }" @change="backData" /> -->
 
-                  <upload-img ref="uploadImg" class="item_input" v-model="itemInfo.urls" :limit="50" bucket="map"
-                    :upload-data="{ type: '0001' }" />
+          </el-row>
 
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">规格图片</div>
+              <el-form-item>
+                <upload-img ref="uploadImg" class="addinputw addinputInfo" v-model="imgList" :limit="50" bucket="map"
+                  :upload-data="{ type: '0001' }" @change="backData" />
               </el-form-item>
             </el-col>
           </el-row>
 
         </el-form>
 
-
         <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
           <el-button type="primary" style="margin-top: 20px;" @click="saveGoodsSkuDttail">确 定</el-button>
         </div>
 
       </el-dialog>
 
-      <!--  <el-card class="box-card">
-        <div class="item">
-          <span class="item_text">选择商品品牌：</span>
-          <el-select v-model="formobj.brand" placeholder="请选择商品品牌" class="item_input" @change="selectBrandChange">
-            <el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
-          </el-select>
-        </div>
-        <div class="item">
-          <span class="item_text">选择商品类别：</span>
-          <el-select v-model="formobj.typeName" placeholder="请选择商品类别" class="item_input" @change="selectCateChange">
-            <el-option v-for="item in cateList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
-          </el-select>
-        </div>
-        <div class="item">
-          <span class="item_text">选择商品厂家：</span>
-          <el-select v-model="formobj.manufacturer" placeholder="请选择商品厂家" class="item_input"
-            @change="selectfacturerChange">
-            <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName" :value="item.sid" />
-          </el-select>
-        </div>
-        <div class="item">
-          <span class="item_text">商品名称：</span>
-          <el-input v-model="formobj.goodsName" placeholder="商品名称" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品编码：</span>
-          <el-input v-model="formobj.goodsCode" placeholder="商品编码" class="item_input" clearable
-            oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
-        </div>
-        <div class="item">
-          <span class="item_text">商品条码：</span>
-          <el-input v-model="formobj.barCode" placeholder="商品条码" class="item_input" clearable
-            oninput="value=value.replace(/[^0-9]/g,'')" />
-        </div>
-        <div class="item">
-          <span class="item_text">商品产地：</span>
-          <el-input v-model="formobj.producer" placeholder="商品产地" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品单位：</span>
-          <el-input v-model="formobj.unit" placeholder="商品单位" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品规格：</span>
-          <el-input v-model="formobj.specification" placeholder="商品规格" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品简介：</span>
-          <el-input v-model="formobj.remarks" placeholder="商品简介" class="item_input" clearable />
-        </div>
-
-        <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
-          <span class="item_text">商品图片：</span>
-          <upload ref="uploadImg2" v-model="imgList" style="margin-top: 20px;" class="item_input" :limit="1"
-            bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }" @change="backData" />
-        </div>
-
-      </el-card> -->
-
     </div>
 
   </div>
@@ -737,6 +751,7 @@
   import req2 from '@/api/goods/brand.js'
   import req3 from '@/api/goods/category.js'
   import req4 from '@/api/goods/factory.js'
+  import req5 from '@/api/goods/unit.js'
   import uploadImg from '@/components/uploadFile/uploadImg'
   export default {
     components: {
@@ -771,6 +786,7 @@
         brandList: [],
         cateList: [],
         facturerList: [],
+        unitNameList: [],
         hideUploadBtn: false,
         dialogVisible: false,
         dialogVisible2: false,
@@ -793,16 +809,15 @@
         req4.getAllFacturer().then(resp => {
           this.facturerList = resp.data
         })
+        req5.getAllUnit().then(resp => {
+          this.unitNameList = resp.data
+        })
       },
       backData(value) {
         console.log('backData》》》》', value)
         console.log('imgList', this.imgList)
 
-        if (this.imgList.length > 0) {
-          this.formobj.picUrl = this.imgList[0].url
-        } else {
-          this.formobj.picUrl = ''
-        }
+        this.itemInfo.urls = this.imgList
 
         this.hideUploadBtn = this.imgList.length != 0
         console.log('this.hideUploadBtn', this.hideUploadBtn)
@@ -890,6 +905,12 @@
         this.formobj.manufacturerSid = choose[0].sid
         this.formobj.manufacturerName = choose[0].manufacturerName
       },
+      selectunitNameChange(val) {
+        const choose = this.unitNameList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectunitNameChange', choose)
+        this.formobj.goodsUnitSid = choose[0].sid
+        this.formobj.goodsUnitName = choose[0].unitName
+      },
       editGoodsSku(goodsSku) {
         console.log('>>>>>>>>>editGoodsSku', goodsSku)
         this.orderInfo = goodsSku
@@ -922,7 +943,7 @@
       },
       saveGoodsSku() {
 
-            console.log('>>>>>>>>>saveGoodsSkuDttail', this.orderInfo)
+        console.log('>>>>>>>>>saveGoodsSkuDttail', this.orderInfo)
 
         if (this.orderInfo.sid == '') {
           this.orderInfo.sid = require('uuid').v1()
@@ -991,7 +1012,7 @@
       addGoodsSku() {
         this.dialogVisible3 = true
         this.orderInfo = {
-          sid:''
+          sid: ''
         }
       }
 
@@ -999,103 +1020,29 @@
     }
   }
 </script>
-<style lang="scss" scoped>
-  // 隐藏上传组件
-
-  ::v-deep .hide {
-    .el-upload--picture-card {
-      display: none !important;
-    }
-  }
-
-  .box-card {
-    margin-left: 60px;
-    margin-right: 60px;
-    min-width: 70%;
-    margin-top: 20px;
-
-    .item {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      margin-top: 15px;
-      height: 40px;
-      line-height: 40px;
-
-      .item_text {
-        flex: 0.8;
-        font-size: 18px;
-        text-align: right;
-      }
-
-      .item_input {
-        flex: 4;
-        font-size: 16px;
-        margin-left: 10px;
-        margin-right: 80px;
-      }
-
-      .item_left_input {
-        width: 20%;
-      }
-
-      .item_left_text {
-        height: 30px;
-        margin-left: 20px;
-        line-height: 30px;
-        color: #018AD2;
-        padding: 0px 15px;
-        border: 1.5px solid #018AD2;
-        border-radius: 5px;
-
-      }
-
-      .item_right {
-        flex: 1;
-        justify-items: center;
-
-        .item_right_list_text {
-          font-size: 16px;
-        }
-
-        .item_right_list_delect {
-          color: #5E94FF;
-          margin-left: 20px;
-          font-size: 16px;
-          text-decoration: underline;
-        }
-      }
-
-    }
-
+<style scoped>
+  .span-sty {
+    width: 130px !important;
   }
 
-  .trightb {
-    display: flex;
-    align-items: center;
-    text-align: center;
-    justify-content: center;
+  .addinputInfo {
+    margin-left: 120px !important;
   }
 
-  .trightb_item {}
-
-  .span {
-    margin-left: 50px;
-    font-size: 15px;
-    font-weight: 400;
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
   }
 
-  ::v-deep .el-collapse-item__header {
-    height: 40px;
-    padding: 10px;
-    font-weight: bold;
-    font-size: 20px;
-    text-align: left;
-    color: #ffffff;
-    background-color: #0294d7;
+  .first_row {
+    border-top: 1px solid #E0E3EB;
   }
 
-  ::v-deep .el-collapse-item__content {
-    padding-bottom: 0;
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
   }
 </style>
diff --git a/yxt-as-ui/src/views/goods/goods/goodsInfo.vue b/yxt-as-ui/src/views/goods/goods/goodsInfo.vue
index cb54f3debc..15ec78ebf9 100644
--- a/yxt-as-ui/src/views/goods/goods/goodsInfo.vue
+++ b/yxt-as-ui/src/views/goods/goods/goodsInfo.vue
@@ -6,7 +6,6 @@
       <div>商品信息</div>
       <!-- start 添加修改按钮 -->
       <div>
-        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
       <!-- end 添加修改按钮 -->
@@ -15,648 +14,432 @@
 
     <div class="listconadd">
 
-      <el-form ref="dataForm" :model="formobj" label-position="top" label-width="190px" class="formadd">
-        <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <div class="title">
           <div>基础信息</div>
         </div>
         <el-row class="first_row">
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品名称</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.goodsName" placeholder="商品名称" class="addinputw" style="width:100%" clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品编码</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品名称</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsName}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.barCode" placeholder="商品编码" style="width: 100%;" class="addinputw" clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">商品简称</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsShortName}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品品牌</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品副标题</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.subTitle}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-select v-model="formobj.brandName" placeholder="请选择商品品牌" class="addinputw" style="width: 100%;"
-                @change="selectBrandChange">
-                <el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
-              </el-select>
+
+          <el-col :span="12">
+            <div class="span-sty">商品拼音缩写</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsPY}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品类别</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品编码</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsCode}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-select v-model="formobj.typeName" placeholder="请选择商品类别" class="addinputw" style="width: 100%;"
-                @change="selectCateChange">
-                <el-option v-for="item in cateList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
-              </el-select>
+
+          <el-col :span="12">
+            <div class="span-sty">商品条形码</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.barCode}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品厂家</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品品牌</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.brandName}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-select v-model="formobj.manufacturerName" placeholder="请选择商品厂家" class="addinputw" style="width: 100%;"
-                @change="selectfacturerChange">
-                <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName"
-                  :value="item.sid" />
-              </el-select>
+
+          <el-col :span="12">
+            <div class="span-sty">商品类别</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.typeName}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">厂家货号</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品厂家</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.manufacturerName}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.factoryCode" placeholder="商品名称" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">厂家货号</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.factoryCode}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">外部编码</span>
+
+          <el-col :span="12">
+            <div class="span-sty">商品单位</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.goodsUnitName}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.externalCode" placeholder="外部编码" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">是否上架</div>
+            <el-form-item>
+              <el-radio-group v-model="formobj.isListed" :disabled="true" size="small" class="addinputw">
+                <el-radio :label="'1'">上架</el-radio>
+                <el-radio :label="'2'">下架</el-radio>
+              </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">国标码</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">外部编码</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.externalCode}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.nationalStandardCode" placeholder="国标码" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">国标码</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.nationalStandardCode}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">税率</span>
+
+          <el-col :span="12">
+            <div class="span-sty">税率</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.taxRate}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.taxRate" placeholder="税率" style="width: 100%;" class="addinputw" clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">保质期天</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.shelfLife}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">保质期天</span>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="12">
+            <div class="span-sty">商品排序</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.sortNo}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.shelfLife" placeholder="保质期天" style="width: 100%;" class="addinputw"
-                clearable />
+
+          <el-col :span="12">
+            <div class="span-sty">商品备注</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.remarks}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品详细说明</span>
+
+          <el-col :span="24">
+            <div class="span-sty">商品详细说明</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.baseGoodsSpuDetail.goodsExplain}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="20">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.baseGoodsSpuDetail.goodsExplain" type="textarea" :rows="4"
-                style="width: 100%;margin-bottom: 5px;;" placeholder="商品详细说明" class="addinputw" clearable />
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">商品描述</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.baseGoodsSpuDetail.goodsDescription}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">商品描述</span>
+
+          <el-col :span="24">
+            <div class="span-sty">商品通用规格参数</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.baseGoodsSpuDetail.genericSpec}}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="20">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.baseGoodsSpuDetail.goodsDescription" type="textarea" :rows="4"
-                style="width: 100%;margin-bottom: 5px;;" placeholder="商品描述" class="addinputw" clearable />
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="24">
+            <div class="span-sty">商品特有规格参数</div>
+            <el-form-item>
+              <span class="addinputInfo">{{formobj.baseGoodsSpuDetail.specialSpec}}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
-        <el-collapse v-model="activeNames" style="margin-top: 20px;">
-          <el-collapse-item name="1">
-            <template slot="title">
-              规格列表<span class="span" @click.stop="add()">添加</span>
-            </template>
-            <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border style="width: 100%;"
-              :row-style="{height: '40px'}">
-              <!-- <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="是否可用" align="center" width="200">
-                <template slot-scope="scope">
-                  <el-switch v-model="scope.row.isEnable" active-text="是" inactive-text="否" active-value="1"
-                    inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
-                </template>
-              </el-table-column>
-              <el-table-column label="规格代码" prop="goodsSkuCode" align="center" />
-              <el-table-column label="标题" prop="title" align="center" />
-              <el-table-column label="外部编码" prop="externalCode" align="center" />
-              <el-table-column label="规格明细" wid align="center" width="250">
-                <template slot-scope="scope">
-                  <el-button type="primary" size="mini"
-                    @click="showGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">查看</el-button>
-                  <el-button type="primary" size="mini"
-                    @click="editGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">编辑</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
 
-          </el-collapse-item>
-        </el-collapse>
+        <div class="title titleOne">
+          <div>规格列表</div>
+        </div>
+        <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border>
+          <!-- <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="规格代码" prop="goodsSkuCode" align="center" />
+          <el-table-column label="商品标题" prop="title" align="center" />
+          <el-table-column label="外部编码" prop="externalCode" align="center" />
+          <el-table-column label="特有规格属性" prop="indexes" align="center" />
+          <el-table-column label="特有规格参数" prop="ownSpec" align="center" />
+          <el-table-column label="规格明细" wid align="center" width="250">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini"
+                @click="showGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">查看</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
 
       </el-form>
 
-
       <el-dialog title="查看规格明细" :visible.sync="dialogVisible" :before-close="handleClose">
-        <el-form ref="dataForm1" class="formadd" style="margin-top: -40px;" :model="itemInfo">
+
+        <el-form ref="dataForm1" class="formaddcopy02" style="margin-top: -40px;" :model="itemInfo">
 
           <el-row class="first_row">
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最后采购价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.finalPurchasePrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">安全库存天数</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.safetyStockDays}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否原厂</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isOriginalFactory}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
 
-          <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否库存警戒</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isInventoryAlert}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒上线</span>
+            <el-col :span="8">
+              <div class="span-sty">最后采购价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.finalPurchasePrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.inventoryAlertUpperLimit}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒下线</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.inventoryAlertLowerLimit}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
 
-          <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">成本价</span>
+            <el-col :span="8">
+              <div class="span-sty">安全库存天数</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.safetyStockDays}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.costPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">吊牌价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.tagPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">销售单价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.salesPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否原厂</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isOriginalFactory" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">标准进价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.standardPurchasePrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">代理价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.agencyPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否库存警戒</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isInventoryAlert" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">折扣</span>
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒上线</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.inventoryAlertUpperLimit}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.discount}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">库存警戒下线</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.inventoryAlertLowerLimit}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
+
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最低零售价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.minimumSalesPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否积分兑换</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isIntegralExchange}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">积分数量</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.integralAmount}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">成本价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.costPrice}}</span>
               </el-form-item>
             </el-col>
-          </el-row>
 
-          <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">规格图片</span>
+            <el-col :span="8">
+              <div class="span-sty">吊牌价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.tagPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="20">
-              <el-form-item class="trightb_item">
-                <template slot-scope="scope">
-                  <span v-for="(item,index) in itemInfo.urls" :key="index">
-                    <el-popover placement="left" trigger="click" width="300">
-                      <img :src="item" width="100%" />
-                      <img slot="reference" :src="item" :alt="item"
-                        style="max-height: 70px;max-width: 70px; padding: 5px" />
-                    </el-popover>
-                  </span>
-                </template>
+
+            <el-col :span="8">
+              <div class="span-sty">销售单价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.salesPrice}}</span>
               </el-form-item>
             </el-col>
-          </el-row>
-        </el-form>
 
-        <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
-          <el-button type="primary" style="margin-top: 20px;" @click="handleClose">关 闭</el-button>
-        </div>
 
-      </el-dialog>
-
-
-
-      <el-dialog title="编辑规格明细" :visible.sync="dialogVisible2" :before-close="handleClose2">
-        <el-form ref="dataForm2" class="formadd" style="margin-top: -40px;" :model="orderInfo">
-          <el-row class="first_row">
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最后采购价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.finalPurchasePrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">安全库存天数</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.safetyStockDays}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否原厂</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isOriginalFactory}}</span>
-              </el-form-item>
-            </el-col>
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否库存警戒</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isInventoryAlert}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒上线</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.inventoryAlertUpperLimit}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">库存警戒下线</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.inventoryAlertLowerLimit}}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
 
-          <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">成本价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.costPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">吊牌价</span>
+            <el-col :span="8">
+              <div class="span-sty">标准进价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.standardPurchasePrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.tagPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">销售单价</span>
+
+            <el-col :span="8">
+              <div class="span-sty">代理价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.agencyPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.salesPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">折扣</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.discount}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">标准进价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.standardPurchasePrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">代理价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.agencyPrice}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">最低零售价</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.minimumSalesPrice}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">折扣</span>
+
+            <el-col :span="8">
+              <div class="span-sty">是否积分兑换</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isIntegralExchange" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.discount}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">积分数量</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.integralAmount}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
+
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">最低零售价</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.minimumSalesPrice}}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">是否积分兑换</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.isIntegralExchange}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">锁定销售价格</div>
+              <el-form-item>
+                <el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small" class="addinputw">
+                  <el-radio :label="'1'">是</el-radio>
+                  <el-radio :label="'2'">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">积分数量</span>
+
+            <el-col :span="8">
+              <div class="span-sty">排序</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.sortNo}}</span>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item class="trightb_item">
-                <span slot="label">{{itemInfo.integralAmount}}</span>
+
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item>
+                <span class="addinputInfo">{{itemInfo.remarks}}</span>
               </el-form-item>
             </el-col>
+
           </el-row>
 
           <el-row>
-            <el-col :span="4" class="trightb">
-              <el-form-item class="trightb_item">
-                <span slot="label">规格图片</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="20">
-              <el-form-item class="trightb_item">
-               <!-- <upload ref="uploadImg2" v-model="imgList" style="margin-top: 20px; z-index: 1000;" class="item_input" :limit="9"
-                  bucket="map" :class="{ hide: false }" :upload-data="{ type: '0001' }" @change="backData" /> -->
-                  <upload-img ref="uploadImg" class="item_input" v-model="itemInfo.urls" :limit="50" bucket="map"
-                    :upload-data="{ type: '0001' }" />
+            <el-col :span="24">
+              <div class="span-sty">规格图片</div>
+              <el-form-item>
+                <template slot-scope="scope">
+                  <span v-for="(item,index) in itemInfo.urls" :key="index" class="addinputInfo">
+                    <el-popover placement="left" trigger="click" width="300">
+                      <img :src="item.url" width="100%" />
+                      <img slot="reference" :src="item.url" :alt="item.url"
+                        style="max-height: 70px;max-width: 70px; padding: 5px" />
+                    </el-popover>
+                  </span>
+                </template>
               </el-form-item>
             </el-col>
           </el-row>
-
         </el-form>
 
-
         <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
-          <el-button type="primary" style="margin-top: 20px;" @click="handleClose2">确 定</el-button>
+          <el-button type="primary" style="margin-top: 20px;" @click="handleClose">关 闭</el-button>
         </div>
 
       </el-dialog>
 
-      <!--  <el-card class="box-card">
-        <div class="item">
-          <span class="item_text">选择商品品牌：</span>
-          <el-select v-model="formobj.brand" placeholder="请选择商品品牌" class="item_input" @change="selectBrandChange">
-            <el-option v-for="item in brandList" :key="item.sid" :label="item.brandName" :value="item.sid" />
-          </el-select>
-        </div>
-        <div class="item">
-          <span class="item_text">选择商品类别：</span>
-          <el-select v-model="formobj.typeName" placeholder="请选择商品类别" class="item_input" @change="selectCateChange">
-            <el-option v-for="item in cateList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
-          </el-select>
-        </div>
-        <div class="item">
-          <span class="item_text">选择商品厂家：</span>
-          <el-select v-model="formobj.manufacturer" placeholder="请选择商品厂家" class="item_input"
-            @change="selectfacturerChange">
-            <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName" :value="item.sid" />
-          </el-select>
-        </div>
-        <div class="item">
-          <span class="item_text">商品名称：</span>
-          <el-input v-model="formobj.goodsName" placeholder="商品名称" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品编码：</span>
-          <el-input v-model="formobj.goodsCode" placeholder="商品编码" class="item_input" clearable
-            oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
-        </div>
-        <div class="item">
-          <span class="item_text">商品条码：</span>
-          <el-input v-model="formobj.barCode" placeholder="商品条码" class="item_input" clearable
-            oninput="value=value.replace(/[^0-9]/g,'')" />
-        </div>
-        <div class="item">
-          <span class="item_text">商品产地：</span>
-          <el-input v-model="formobj.producer" placeholder="商品产地" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品单位：</span>
-          <el-input v-model="formobj.unit" placeholder="商品单位" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品规格：</span>
-          <el-input v-model="formobj.specification" placeholder="商品规格" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">商品简介：</span>
-          <el-input v-model="formobj.remarks" placeholder="商品简介" class="item_input" clearable />
-        </div>
-
-        <div class="item" style="margin-bottom: 100px;margin-top: 100px;">
-          <span class="item_text">商品图片：</span>
-          <upload ref="uploadImg2" v-model="imgList" style="margin-top: 20px;" class="item_input" :limit="1"
-            bucket="map" :class="{ hide: hideUploadBtn }" :upload-data="{ type: '0001' }" @change="backData" />
-        </div>
-
-      </el-card> -->
-
     </div>
 
   </div>
@@ -664,14 +447,7 @@
 
 <script>
   import req from '@/api/goods/goods.js'
-  import req2 from '@/api/goods/brand.js'
-  import req3 from '@/api/goods/category.js'
-  import req4 from '@/api/goods/factory.js'
- import uploadImg from '@/components/uploadFile/uploadImg'
- export default {
-   components: {
-     uploadImg
-   },
+  export default {
     data() {
       return {
         listLoading: false,
@@ -698,9 +474,6 @@
           },
           baseGoodsSkuDtos: []
         },
-        brandList: [],
-        cateList: [],
-        facturerList: [],
         hideUploadBtn: false,
         dialogVisible: false,
         dialogVisible2: false,
@@ -708,52 +481,9 @@
         orderInfo: {}
       }
     },
-    created() {
-      this.initData()
-    },
+    created() {},
     methods: {
-      initData() {
-        req2.getAllBrand().then(resp => {
-          this.brandList = resp.data
-        })
-        req3.getAllType().then(resp => {
-          this.cateList = resp.data
-        })
-        req4.getAllFacturer().then(resp => {
-          this.facturerList = resp.data
-        })
-      },
-      backData(value) {
-        console.log('backData》》》》', value)
-        console.log('imgList', this.imgList)
-
-        if (this.imgList.length > 0) {
-          this.formobj.picUrl = this.imgList[0].url
-        } else {
-          this.formobj.picUrl = ''
-        }
 
-        this.hideUploadBtn = this.imgList.length != 0
-        console.log('this.hideUploadBtn', this.hideUploadBtn)
-      },
-
-      saveOrUpdate() {
-        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
-        req.saveGoods(this.formobj)
-          .then(resp => {
-            if (resp.success) {
-              this.$message({
-                showClose: true,
-                type: 'success',
-                message: resp.msg
-              })
-              this.handleReturn('true')
-            } else {
-              // 根据resp.code进行异常情况处理
-            }
-          })
-          .catch(() => {})
-      },
       handleReturn(isreload) {
         if (isreload === 'true') this.$emit('reloadlist')
         this.imgList = []
@@ -796,40 +526,12 @@
             this.formobj = row
           })
       },
-      selectBrandChange(val) {
-        const choose = this.brandList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectBrandChange', choose)
-        this.formobj.brandSid = choose[0].sid
-        this.formobj.brandName = choose[0].brandName
-      },
-      selectCateChange(val) {
-        const choose = this.cateList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectCateChange', choose)
-        this.formobj.goodsTypeSid = choose[0].sid
-        this.formobj.typeName = choose[0].goodsTypeName
-      },
-      selectfacturerChange(val) {
-        const choose = this.facturerList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectfacturerChange', choose)
-        this.formobj.manufacturerSid = choose[0].sid
-        this.formobj.manufacturerName = choose[0].manufacturerName
-      },
-
 
       showGoodsSkuDttail(goodsSkuDto) {
         console.log('>>>>>>>>>showGoodsSkuDttail', goodsSkuDto)
 
         this.dialogVisible = true
         this.itemInfo = goodsSkuDto
-        this.imgList = goodsSkuDto.urls
-      },
-
-      editGoodsSkuDttail(goodsSkuDto) {
-        console.log('>>>>>>>>>editGoodsSkuDttail', goodsSkuDto)
-
-        this.dialogVisible2 = true
-        this.itemInfo = goodsSkuDto
-        this.imgList = goodsSkuDto.urls
       },
 
       handleClose() {
@@ -843,103 +545,29 @@
     }
   }
 </script>
-<style lang="scss" scoped>
-  // 隐藏上传组件
-
-  ::v-deep .hide {
-    .el-upload--picture-card {
-      display: none !important;
-    }
+<style scoped>
+  .span-sty {
+    width: 130px !important;
   }
 
-  .box-card {
-    margin-left: 60px;
-    margin-right: 60px;
-    min-width: 70%;
-    margin-top: 20px;
-
-    .item {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      margin-top: 15px;
-      height: 40px;
-      line-height: 40px;
-
-      .item_text {
-        flex: 0.8;
-        font-size: 18px;
-        text-align: right;
-      }
-
-      .item_input {
-        flex: 4;
-        font-size: 16px;
-        margin-left: 10px;
-        margin-right: 80px;
-      }
-
-      .item_left_input {
-        width: 20%;
-      }
-
-      .item_left_text {
-        height: 30px;
-        margin-left: 20px;
-        line-height: 30px;
-        color: #018AD2;
-        padding: 0px 15px;
-        border: 1.5px solid #018AD2;
-        border-radius: 5px;
-
-      }
-
-      .item_right {
-        flex: 1;
-        justify-items: center;
-
-        .item_right_list_text {
-          font-size: 16px;
-        }
-
-        .item_right_list_delect {
-          color: #5E94FF;
-          margin-left: 20px;
-          font-size: 16px;
-          text-decoration: underline;
-        }
-      }
-
-    }
-
-  }
-
-  .trightb {
-    display: flex;
-    align-items: center;
-    text-align: center;
-    justify-content: center;
+  .addinputInfo {
+    margin-left: 120px !important;
   }
 
-  .trightb_item {}
-
-  .span {
-    margin-left: 50px;
-    font-size: 15px;
-    font-weight: 400;
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
   }
 
-  ::v-deep .el-collapse-item__header {
-    height: 40px;
-    padding: 10px;
-    font-weight: bold;
-    font-size: 20px;
-    text-align: left;
-    color: #ffffff;
-    background-color: #0294d7;
+  .first_row {
+    border-top: 1px solid #E0E3EB;
   }
 
-  ::v-deep .el-collapse-item__content {
-    padding-bottom: 0;
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
   }
 </style>
diff --git a/yxt-as-ui/src/views/goods/goods/index.vue b/yxt-as-ui/src/views/goods/goods/index.vue
index ffd2d1adcb..a1d9415088 100644
--- a/yxt-as-ui/src/views/goods/goods/index.vue
+++ b/yxt-as-ui/src/views/goods/goods/index.vue
@@ -67,7 +67,7 @@
     <!-- 新增修改部分组件 -->
     <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
     <!-- 详情部分组件 -->
-    <divInfo v-show="viewState == 4" ref="divinfo" />
+    <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
 
   </div>
 </template>
@@ -230,8 +230,8 @@
         this.$router.go(-1)
       },
       toRelevancy(row) {
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row)
+        this.viewState = 4
+        this.$refs['divinfo'].showEdit(row)
       },
       toRelevancyInfo(row) {
         const tip = '请确认是否删除所选品牌?'

From a49a2a4358737c68d146e5a3e93f7613c1fe1cc4 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Wed, 8 May 2024 14:35:07 +0800
Subject: [PATCH 2/4] 1

---
 yxt-as-ui/src/views/goods/brands/brandsAdd.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue
index 79f461d2c9..526e4c6beb 100644
--- a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue
+++ b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue
@@ -3,7 +3,7 @@
 
     <div class="tab-header webtop">
       <!-- 标题 -->
-      <div>商品信息</div>
+      <div>品牌信息</div>
       <!-- start 添加修改按钮 -->
       <div>
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>

From c52b32f0244b27c98f1eee5f06378669132585e0 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 8 May 2024 14:39:30 +0800
Subject: [PATCH 3/4] base

---
 .../basebrandinfo/BaseBrandInfoService.java   |  2 +-
 .../BaseGoodsSkuExtendService.java            | 11 ++++-----
 .../biz/base/basegoodsspu/BaseGoodsSpuVo.java |  3 +++
 .../BaseManufacturerService.java              |  2 +-
 .../WmsWarehouseExtend.java                   | 23 +++++--------------
 .../WmsWarehouseExtendVo.java                 | 22 +++++-------------
 .../WmsWarehouseInfoService.java              | 13 +++++++----
 7 files changed, 30 insertions(+), 46 deletions(-)

diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java
index ae51d038bb..b550a1be61 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java
@@ -70,7 +70,7 @@ public class BaseBrandInfoService extends MybatisBaseService<BaseBrandInfoMapper
             wmsGoodsBrand.setModifyTime(new Date());
             baseMapper.updateById(wmsGoodsBrand);
         } else {
-            BaseBrandInfo goods=baseMapper.selectOne(new QueryWrapper<BaseBrandInfo>().eq("name",dto.getBrandName()));
+            BaseBrandInfo goods=baseMapper.selectOne(new QueryWrapper<BaseBrandInfo>().eq("brandName",dto.getBrandName()));
             if(null!=goods){
                 return rb.setMsg("商品名不能重复");
             }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java
index 72ffc2ec98..0db5492581 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtendService.java
@@ -72,20 +72,17 @@ public class BaseGoodsSkuExtendService extends MybatisBaseService<BaseGoodsSkuEx
             BaseGoodsSkuExtend wmsGoods = fetchBySid(dto.getSid());
             BeanUtil.copyProperties(dto, wmsGoods);
             wmsGoods.setModifyTime(new Date());
+            wmsGoods.setPicUrl("");
             for (UrlsVo url : dto.getUrls()) {
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 String path = url.getUrl().substring(urlPrefix.length());
-                if(StringUtils.isBlank(dto.getPicUrl())){
+                if(StringUtils.isBlank(wmsGoods.getPicUrl())){
                     wmsGoods.setPicUrl(path);
                 }else{
                     wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path);
                 }
             }
-            if (StringUtils.isNotBlank(dto.getPicUrl())) {
-                String urlPrefix = fileUploadComponent.getUrlPrefix();
-                String path = dto.getPicUrl().substring(urlPrefix.length());
-                wmsGoods.setPicUrl(path);
-            }
+
             baseMapper.updateById(wmsGoods);
 
         } else {
@@ -96,7 +93,7 @@ public class BaseGoodsSkuExtendService extends MybatisBaseService<BaseGoodsSkuEx
             for (UrlsVo url : dto.getUrls()) {
                 String urlPrefix = fileUploadComponent.getUrlPrefix();
                 String path = url.getUrl().substring(urlPrefix.length());
-                if(StringUtils.isBlank(dto.getPicUrl())){
+                if(StringUtils.isBlank(wmsGoods.getPicUrl())){
                     wmsGoods.setPicUrl(path);
                 }else{
                     wmsGoods.setPicUrl(wmsGoods.getPicUrl()+","+path);
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuVo.java
index 02b83912de..b31ba83cc6 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuVo.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuVo.java
@@ -46,6 +46,9 @@ public class BaseGoodsSpuVo implements Vo {
     private String isListed;//是否上架
     private String useOrgSid;//使用组织sid
     private String createOrgSid;//创建组织sid
+    private String typeName;//类型
+    private String brandName;//品牌
+    private String manufacturerName;//厂家
     private BaseGoodsSpuDetailVo baseGoodsSpuDetail;
     private List<BaseGoodsSkuVo> baseGoodsSkus;
 }
diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java
index 2d49dca555..c27e6d8469 100644
--- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java
+++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java
@@ -29,7 +29,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         BaseManufacturerQuery query = pq.getParams();
         QueryWrapper<BaseManufacturer> qw = new QueryWrapper<>();
         if(StringUtils.isNotBlank(query.getName())){
-            qw.like("goodsTypeName",query.getName());
+            qw.like("manufacturerName",query.getName());
         }
 
         IPage<BaseManufacturer> page = PagerUtil.queryToPage(pq);
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtend.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtend.java
index 2bdcd70163..2f3b520bbf 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtend.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtend.java
@@ -10,22 +10,11 @@ import lombok.Data;
 @Data
 public class WmsWarehouseExtend extends BaseEntity {
 
-    private String warehouseName;//仓库名称
-    private String warehouseCode;//仓库编码
-    private String contacts;//联系人
-    private String mob;//手机
-    private String telephone;//联系电话
-    private String manager;//主管
-    private String areaSid;//地区sid
-    private String address;//地址
-    private String longitude;//经度
-    private String latitude;//纬度
-    private String warehouseTypeKey;//仓库类型Key
-    private String warehouseTypeValue;//仓库类型value
-    private String usageStatus;//使用状态,0停用 1正常
-    private String squareMeter;//平方米
-    private String sortNo;//创建组织sid
-    private String useOrgSid;//创建组织sid
-    private String createOrgSid;//创建组织sid
+    private String warehouseSid;//仓库sid
+    private String markupRate1;//加价率1
+    private String markupRate2;//加价率2
+    private String markupRate3;//加价率3
+    private String markupRate4;//加价率4
+    private String markupRate5;//加价率5
 
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendVo.java
index 6198f59691..2de271100d 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendVo.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseextend/WmsWarehouseExtendVo.java
@@ -23,21 +23,11 @@ public class WmsWarehouseExtendVo implements Vo {
     private String isEnable;
     private String state;
     private String isDelete;
+    private String warehouseSid;//仓库sid
     private String warehouseName;//仓库名称
-    private String warehouseCode;//仓库编码
-    private String contacts;//联系人
-    private String mob;//手机
-    private String telephone;//联系电话
-    private String manager;//主管
-    private String areaSid;//地区sid
-    private String address;//地址
-    private String longitude;//经度
-    private String latitude;//纬度
-    private String warehouseTypeKey;//仓库类型Key
-    private String warehouseTypeValue;//仓库类型value
-    private String usageStatus;//使用状态,0停用 1正常
-    private String squareMeter;//平方米
-    private String sortNo;//创建组织sid
-    private String useOrgSid;//创建组织sid
-    private String createOrgSid;//创建组织sid
+    private String markupRate1;//加价率1
+    private String markupRate2;//加价率2
+    private String markupRate3;//加价率3
+    private String markupRate4;//加价率4
+    private String markupRate5;//加价率5
 }
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java
index f98021be00..45b12c5079 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java
@@ -64,8 +64,10 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
 //            for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
 //                wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
 //            }
-            dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
-            wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+            if(dto.getWmsWarehouseExtendDto()!=null){
+                dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
+                wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+            }
         } else {
             WmsWarehouseInfo wmsWarehouse = new WmsWarehouseInfo();
             sid = wmsWarehouse.getSid();
@@ -75,8 +77,11 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
 //            for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) {
 //                wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid());
 //            }
-            dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
-            wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+            if(dto.getWmsWarehouseExtendDto()!=null){
+                dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid());
+                wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto());
+            }
+
         }
 
         return rb.success().setMsg("成功");

From 0ac3b2defe51e8c3f726e41126ac622756a76d62 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 8 May 2024 15:00:12 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=82=E5=AE=B6=E7=B4=A2=E8=B5=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../as/api/asbusclaimbill/AsBusclaimBill.java |  51 +++++++++
 .../api/asbusclaimbill/AsBusclaimBillDto.java |  24 ++++
 .../asbusclaimbill/AsBusclaimBillQuery.java   |  33 ++++++
 .../api/asbusclaimbill/AsBusclaimBillVo.java  |  40 +++++++
 .../AsBusclaimInvoiceBill.java                |  56 ++++++++++
 .../AsBusclaimInvoiceBillDto.java             |  44 ++++++++
 .../AsBusclaimInvoiceBillQuery.java           |  41 +++++++
 .../AsBusclaimInvoiceBillVo.java              |  39 +++++++
 .../AsBusclaimInvoiceBillDetail.java          |  37 +++++++
 .../AsBusclaimInvoiceBillDetailDto.java       |  36 ++++++
 .../asbusclaimbill/AsBusclaimBillMapper.java  |  20 ++++
 .../asbusclaimbill/AsBusclaimBillMapper.xml   |  22 ++++
 .../asbusclaimbill/AsBusclaimBillRest.java    |  42 +++++++
 .../asbusclaimbill/AsBusclaimBillService.java |  67 +++++++++++
 .../AsBusclaimInvoiceBillMapper.java          |  20 ++++
 .../AsBusclaimInvoiceBillMapper.xml           |  21 ++++
 .../AsBusclaimInvoiceBillRest.java            |  42 +++++++
 .../AsBusclaimInvoiceBillService.java         | 104 ++++++++++++++++++
 .../AsBusclaimInvoiceBillDetailMapper.java    |  14 +++
 .../AsBusclaimInvoiceBillDetailMapper.xml     |   4 +
 .../AsBusclaimInvoiceBillDetailRest.java      |  14 +++
 .../AsBusclaimInvoiceBillDetailService.java   |  14 +++
 .../inventory/wmsansbill/WmsAnsBillDto.java   |   2 +
 23 files changed, 787 insertions(+)
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBill.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillDto.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillQuery.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillVo.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBill.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailDto.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailRest.java
 create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailService.java

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBill.java
new file mode 100644
index 0000000000..dd55d1a77a
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBill.java
@@ -0,0 +1,51 @@
+package com.yxt.anrui.as.api.asbusclaimbill;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimBill extends BaseEntity {
+    private static final long serialVersionUID = 658254140218350561L;
+
+    @ApiModelProperty("索赔单号")
+    private String billNo;
+    @ApiModelProperty("上报日期")
+    private String reportDate;
+    @ApiModelProperty("维修工单sid")
+    private String repairBillSid;
+    @ApiModelProperty("维修工单号")
+    private String repairBillNo;
+    @ApiModelProperty("工时费")
+    private BigDecimal hourAmount;
+    @ApiModelProperty("材料费")
+    private BigDecimal goodsAmount;
+    @ApiModelProperty("其他费用")
+    private BigDecimal otherAmount;
+    @ApiModelProperty("索赔工时费")
+    private BigDecimal claimHourAmount;
+    @ApiModelProperty("索赔材料费")
+    private BigDecimal claimGoodsAmount;
+    @ApiModelProperty("索赔外出费")
+    private BigDecimal claimOutAmount;
+    @ApiModelProperty("索赔厂家补助")
+    private BigDecimal claimSubsidyAmount;
+    @ApiModelProperty("索赔其他费用")
+    private BigDecimal claimOtherAmount;
+    @ApiModelProperty("开票状态")
+    private Integer invoiceState;
+    @ApiModelProperty("开票时间")
+    private Date invoiceTime;
+    @ApiModelProperty("回款时间")
+    private Date returnAmountTime;
+    @ApiModelProperty("调整状态")
+    private Integer adjustState;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillDto.java
new file mode 100644
index 0000000000..8e79884c1f
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillDto.java
@@ -0,0 +1,24 @@
+package com.yxt.anrui.as.api.asbusclaimbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimBillDto {
+
+    @ApiModelProperty("维修工单sid")
+    private String repairBillSid;
+    @ApiModelProperty("维修工单编号")
+    private String repairBillNo;
+    @ApiModelProperty("厂家索赔号")
+    private String billNo;
+
+    private String createBySid;
+
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillQuery.java
new file mode 100644
index 0000000000..3045669f7d
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillQuery.java
@@ -0,0 +1,33 @@
+package com.yxt.anrui.as.api.asbusclaimbill;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimBillQuery implements Query {
+    private static final long serialVersionUID = 2257942964066440023L;
+
+    @ApiModelProperty("索赔单号")
+    private String billNo;
+
+    @ApiModelProperty("维修工单号")
+    private String repairBillNo;
+
+    @ApiModelProperty("单据状态")
+    private String state;
+
+    @ApiModelProperty("开票状态")
+    private String invoiceState;
+
+    @ApiModelProperty("应收调整状态")
+    private String adjustState;
+
+    private String createBySid;
+    private String orgPath;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillVo.java
new file mode 100644
index 0000000000..1dbc90c6c9
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaimbill/AsBusclaimBillVo.java
@@ -0,0 +1,40 @@
+package com.yxt.anrui.as.api.asbusclaimbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimBillVo {
+    private String sid;
+    @ApiModelProperty("维修工单号")
+    private String repairBillNo;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车牌号")
+    private String vehmark;
+    @ApiModelProperty("索赔单号")
+    private String billNo;
+    @ApiModelProperty("更新时间")
+    private String modifyTime;
+    @ApiModelProperty("索赔工时费")
+    private String claimHourAmount;
+    @ApiModelProperty("索赔材料费")
+    private String claimGoodsAmount;
+    @ApiModelProperty("外出费")
+    private String claimOutAmount;
+    @ApiModelProperty("厂家补助")
+    private String claimSubsidyAmount;
+    @ApiModelProperty("索赔其他费用")
+    private String claimOtherAmount;
+    @ApiModelProperty("单据状态")
+    private String state;
+    @ApiModelProperty("开票状态")
+    private String invoiceState;
+    @ApiModelProperty("应收调整状态")
+    private String adjustState;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBill.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBill.java
new file mode 100644
index 0000000000..3870eba8c7
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBill.java
@@ -0,0 +1,56 @@
+package com.yxt.anrui.as.api.asbusclaiminvoicebill;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBill extends BaseEntity {
+    private static final long serialVersionUID = 710287793128613158L;
+    private String billNo;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("申请部门sid")
+    private String createDeptSid;
+    @ApiModelProperty("申请部门")
+    private String createDeptName;
+    @ApiModelProperty("开票sid")
+    private String invoiceSid;
+    @ApiModelProperty("开票名称")
+    private String invoiceName;
+    @ApiModelProperty("开票类型key")
+    private String invoiceKey;
+    @ApiModelProperty("开票类型value")
+    private String invoiceValue;
+    @ApiModelProperty("开票金额")
+    private BigDecimal invoiceMoney;
+    @ApiModelProperty("附件")
+    private String file;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("组织全路径sid")
+    private String orgSidPath;
+    @ApiModelProperty("办结日期")
+    private String closeDate;
+    @ApiModelProperty("实例id")
+    private String procInstId;
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("任务iD")
+    private String taskId;
+    @ApiModelProperty("环节iD")
+    private String taskDefKey;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java
new file mode 100644
index 0000000000..3a297512fa
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillDto.java
@@ -0,0 +1,44 @@
+package com.yxt.anrui.as.api.asbusclaiminvoicebill;
+
+import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBillDto {
+    private String sid;
+    private String createBySid;
+    private String createByName;
+    private String orgPath;
+
+    private String createTime;
+
+    @ApiModelProperty("申请部门sid")
+    private String createDeptSid;
+    @ApiModelProperty("申请部门")
+    private String createDeptName;
+    @ApiModelProperty("开票sid")
+    private String invoiceSid;
+    @ApiModelProperty("开票名称")
+    private String invoiceName;
+    @ApiModelProperty("开票类型key")
+    private String invoiceKey;
+    @ApiModelProperty("开票类型value")
+    private String invoiceValue;
+    @ApiModelProperty("开票金额")
+    private String invoiceMoney;
+
+    private List<String> fileList = new ArrayList<>();
+    private String remarks;
+
+    private List<AsBusclaimInvoiceBillDetailDto> detailList = new ArrayList<>();
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java
new file mode 100644
index 0000000000..302e63faa8
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillQuery.java
@@ -0,0 +1,41 @@
+package com.yxt.anrui.as.api.asbusclaiminvoicebill;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBillQuery implements Query {
+    private static final long serialVersionUID = 4545269610778397290L;
+
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("申请部门")
+    private String createDeptName;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("申请日期开始时间")
+    private String createTimeStart;
+    @ApiModelProperty("申请日期结束时间")
+    private String createTimeEnd;
+    @ApiModelProperty("办结日期开始时间")
+    private String closeDateStart;
+    @ApiModelProperty("办结日期结束时间")
+    private String closeDateEnd;
+    @ApiModelProperty("开票名称")
+    private String invoiceName;
+    @ApiModelProperty("开票类型key")
+    private String invoiceKey;
+
+    private String createBySid;
+    private String orgPath;
+
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java
new file mode 100644
index 0000000000..9b11c36c77
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebill/AsBusclaimInvoiceBillVo.java
@@ -0,0 +1,39 @@
+package com.yxt.anrui.as.api.asbusclaiminvoicebill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBillVo {
+
+    //sid
+    private String sid;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("分公司")
+    private String useOrgName;
+    @ApiModelProperty("申请部门")
+    private String createDeptName;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("申请日期")
+    private String createTime;
+    @ApiModelProperty("办结日期")
+    private String closeDate;
+    @ApiModelProperty("开票名称")
+    private String invoiceName;
+    @ApiModelProperty("开票类型value")
+    private String invoiceValue;
+    @ApiModelProperty("开票金额")
+    private String invoiceMoney;
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java
new file mode 100644
index 0000000000..86d4e06dc2
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetail.java
@@ -0,0 +1,37 @@
+package com.yxt.anrui.as.api.asbusclaiminvoicebilldetail;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBillDetail extends BaseEntity {
+    private static final long serialVersionUID = -9031944826444643101L;
+    @ApiModelProperty("单据sid")
+    private String billSid;
+    @ApiModelProperty("索赔单号")
+    private String claimBillNo;
+    @ApiModelProperty("维修工单号")
+    private String repairBillNo;
+    @ApiModelProperty("车牌号")
+    private String vehmark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("索赔工时费")
+    private BigDecimal claimHourAmount;
+    @ApiModelProperty("索赔材料费")
+    private String claimGoodsAmount;
+    @ApiModelProperty("外出费")
+    private String claimOutAmount;
+    @ApiModelProperty("厂家补助费")
+    private String claimSubsidyAmount;
+    @ApiModelProperty("其他费用")
+    private String claimOtherAmount;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailDto.java
new file mode 100644
index 0000000000..ff60a26a8f
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailDto.java
@@ -0,0 +1,36 @@
+package com.yxt.anrui.as.api.asbusclaiminvoicebilldetail;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Data
+public class AsBusclaimInvoiceBillDetailDto {
+
+    @ApiModelProperty("索赔单号")
+    private String claimBillNo;
+    @ApiModelProperty("维修工单号")
+    private String repairBillNo;
+    @ApiModelProperty("车牌号")
+    private String vehmark;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("索赔工时费")
+    private BigDecimal claimHourAmount;
+    @ApiModelProperty("索赔材料费")
+    private String claimGoodsAmount;
+    @ApiModelProperty("外出费")
+    private String claimOutAmount;
+    @ApiModelProperty("厂家补助费")
+    private String claimSubsidyAmount;
+    @ApiModelProperty("其他费用")
+    private String claimOtherAmount;
+
+    private String remarks;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.java
new file mode 100644
index 0000000000..d9e34366bb
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.java
@@ -0,0 +1,20 @@
+package com.yxt.anrui.as.biz.asbusclaimbill;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Mapper
+public interface AsBusclaimBillMapper extends BaseMapper<AsBusclaimBill> {
+    IPage<AsBusclaimBillVo> listPage(IPage<AsBusclaimBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusclaimBill> qw);
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml
new file mode 100644
index 0000000000..d34ccc4870
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.asbusclaimbill.AsBusclaimBillMapper">
+    <select id="listPage" resultType="com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo">
+        select a.sid,
+               a.repairBillNo,
+               a.billNo,
+               DATE_FORMAT(a.modifyTime, '%Y-%m-%d') as modifyTime,
+               a.claimHourAmount,
+               a.claimGoodsAmount,
+               a.claimOutAmount,
+               a.claimSubsidyAmount,
+               a.claimOtherAmount,
+               a.state,
+               a.invoiceState,
+               a.adjustState
+        from as_busclaim_bill a
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java
new file mode 100644
index 0000000000..5ecbfdbead
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillRest.java
@@ -0,0 +1,42 @@
+package com.yxt.anrui.as.biz.asbusclaimbill;
+
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillDto;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillQuery;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@RestController
+@RequestMapping("v1/AsBusclaimBill")
+public class AsBusclaimBillRest {
+
+    @Autowired
+    private AsBusclaimBillService asBusclaimBillService;
+
+    @PostMapping("/save")
+    @ApiOperation("维护厂家索赔单号")
+    ResultBean save(@RequestBody AsBusclaimBillDto dto) {
+        return asBusclaimBillService.saveBill(dto);
+    }
+
+    @PostMapping("/listPage")
+    @ApiOperation("厂家索赔单分页列表")
+    ResultBean<PagerVo<AsBusclaimBillVo>> listPage(@RequestBody PagerQuery<AsBusclaimBillQuery> pagerQuery) {
+        ResultBean<PagerVo<AsBusclaimBillVo>> rb = ResultBean.fireFail();
+        PagerVo<AsBusclaimBillVo> pv = asBusclaimBillService.listPage(pagerQuery);
+        return rb.success().setData(pv);
+    }
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java
new file mode 100644
index 0000000000..0557ed3026
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimbill/AsBusclaimBillService.java
@@ -0,0 +1,67 @@
+package com.yxt.anrui.as.biz.asbusclaimbill;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillDto;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillQuery;
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBill;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListQuery;
+import com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairBillPageListVo;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Service
+public class AsBusclaimBillService extends MybatisBaseService<AsBusclaimBillMapper, AsBusclaimBill> {
+    public ResultBean saveBill(AsBusclaimBillDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        AsBusclaimBill asBusclaimBill = new AsBusclaimBill();
+        BeanUtil.copyProperties(dto, asBusclaimBill, "sid");
+        asBusclaimBill.setReportDate(DateUtil.today());
+        baseMapper.insert(asBusclaimBill);
+        return rb.success();
+    }
+
+    public PagerVo<AsBusclaimBillVo> listPage(PagerQuery<AsBusclaimBillQuery> pagerQuery) {
+        AsBusclaimBillQuery query = pagerQuery.getParams();
+        QueryWrapper<AsBusclaimBill> qw = new QueryWrapper<>();
+        //ToDo:添加查询条件
+        //索赔单号
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("a.billNo", query.getBillNo());
+        }
+        //维修工单号
+        if (StringUtils.isNotBlank(query.getRepairBillNo())) {
+            qw.like("a.repairBillNo", query.getRepairBillNo());
+        }
+        //单据状态
+        if (StringUtils.isNotBlank(query.getState())) {
+            qw.like("a.state", query.getState());
+        }
+        //开票状态
+        if (StringUtils.isNotBlank(query.getInvoiceState())) {
+            qw.like("a.invoiceState", query.getInvoiceState());
+        }
+        //应收调整状态
+        if (StringUtils.isNotBlank(query.getAdjustState())) {
+            qw.like("a.adjustState", query.getAdjustState());
+        }
+        IPage<AsBusclaimBill> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AsBusclaimBillVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<AsBusclaimBillVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java
new file mode 100644
index 0000000000..e1e72f7dab
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.java
@@ -0,0 +1,20 @@
+package com.yxt.anrui.as.biz.asbusclaiminvoicebill;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBill;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Mapper
+public interface AsBusclaimInvoiceBillMapper extends BaseMapper<AsBusclaimInvoiceBill> {
+    IPage<AsBusclaimInvoiceBillVo> listPage(IPage<AsBusclaimInvoiceBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusclaimInvoiceBill> qw);
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml
new file mode 100644
index 0000000000..e91d92813e
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.asbusclaiminvoicebill.AsBusclaimInvoiceBillMapper">
+    <select id="listPage" resultType="com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo">
+        select a.sid,
+               a.nodeState,
+               a.billNo,
+               a.useOrgName,
+               a.createDeptName,
+               a.createByName,
+               DATE_FORMAT(a.createTime, '%Y-%m-%d') as createTime,
+               a.closeDate,
+               a.invoiceName,
+               a.invoiceValue,
+               a.invoiceMoney
+        from as_busclaim_invoice_bill a
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java
new file mode 100644
index 0000000000..646346eef5
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillRest.java
@@ -0,0 +1,42 @@
+package com.yxt.anrui.as.biz.asbusclaiminvoicebill;
+
+import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBillVo;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillDto;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillQuery;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@RestController
+@RequestMapping("v1/AsBusclaimInvoiceBill")
+public class AsBusclaimInvoiceBillRest {
+
+    @Autowired
+    private AsBusclaimInvoiceBillService asBusclaimInvoiceBillService;
+
+    @PostMapping("/listPage")
+    @ApiOperation("厂家索赔开票分页")
+    ResultBean<PagerVo<AsBusclaimInvoiceBillVo>> listPage(@RequestBody PagerQuery<AsBusclaimInvoiceBillQuery> pagerQuery) {
+        ResultBean<PagerVo<AsBusclaimInvoiceBillVo>> rb = ResultBean.fireFail();
+        PagerVo<AsBusclaimInvoiceBillVo> pv = asBusclaimInvoiceBillService.listPage(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
+    @PostMapping("/saveOrUpdateBill")
+    @ApiOperation("厂家索赔开票新增修改保存")
+    ResultBean<String> saveOrUpdateBill(@RequestBody AsBusclaimInvoiceBillDto dto) {
+        return asBusclaimInvoiceBillService.saveOrUpdateBill(dto);
+    }
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java
new file mode 100644
index 0000000000..3c6ba4f2dc
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java
@@ -0,0 +1,104 @@
+package com.yxt.anrui.as.biz.asbusclaiminvoicebill;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBill;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillDto;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillQuery;
+import com.yxt.anrui.as.api.asbusclaiminvoicebill.AsBusclaimInvoiceBillVo;
+import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailDto;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Service
+public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimInvoiceBillMapper, AsBusclaimInvoiceBill> {
+
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
+    public PagerVo<AsBusclaimInvoiceBillVo> listPage(PagerQuery<AsBusclaimInvoiceBillQuery> pagerQuery) {
+        AsBusclaimInvoiceBillQuery query = pagerQuery.getParams();
+        QueryWrapper<AsBusclaimInvoiceBill> qw = new QueryWrapper<>();
+        //ToDo:添加查询条件
+        //分公司
+        if (StringUtils.isNotBlank(query.getUseOrgName())) {
+            qw.like("a.useOrgName", query.getUseOrgName());
+        }
+        //申请部门
+        if (StringUtils.isNotBlank(query.getCreateDeptName())) {
+            qw.like("a.createDeptName", query.getCreateDeptName());
+        }
+        //申请人
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.like("a.createByName", query.getCreateByName());
+        }
+        //单据编号
+        if (StringUtils.isNotBlank(query.getBillNo())) {
+            qw.like("a.billNo", query.getBillNo());
+        }
+        //申请日期开始时间-申请日期结束时间
+        qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
+                );
+        //办结日期开始时间-办结日期结束时间
+        qw.apply(StringUtils.isNotBlank(query.getCloseDateStart()), "date_format (a.closeDate,'%Y-%m-%d') >= date_format('" + query.getCloseDateStart() + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(query.getCloseDateEnd()), "date_format (a.closeDate,'%Y-%m-%d') <= date_format('" + query.getCloseDateEnd() + "','%Y-%m-%d')"
+                );
+        //开票名称
+        if (StringUtils.isNotBlank(query.getInvoiceName())) {
+            qw.like("a.invoiceName", query.getInvoiceName());
+        }
+        //开票类型
+        if (StringUtils.isNotBlank(query.getInvoiceKey())) {
+            qw.eq("a.invoiceKey", query.getInvoiceKey());
+        }
+
+        IPage<AsBusclaimInvoiceBill> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<AsBusclaimInvoiceBillVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<AsBusclaimInvoiceBillVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean<String> saveOrUpdateBill(AsBusclaimInvoiceBillDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        if (StringUtils.isBlank(sid)) {
+            AsBusclaimInvoiceBill asBusclaimInvoiceBill = new AsBusclaimInvoiceBill();
+            BeanUtil.copyProperties(dto, asBusclaimInvoiceBill, "sid");
+            asBusclaimInvoiceBill.setOrgSidPath(dto.getOrgPath());
+            asBusclaimInvoiceBill.setCreateBySid(dto.getCreateBySid());
+            sid = asBusclaimInvoiceBill.getSid();
+            List<String> fileList = dto.getFileList();
+            fileList.removeAll(Collections.singleton(null));
+            if (!fileList.isEmpty()) {
+                String files = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
+                asBusclaimInvoiceBill.setFile(files);
+            }
+            List<AsBusclaimInvoiceBillDetailDto> detailList = dto.getDetailList();
+            detailList.removeAll(Collections.singleton(null));
+            if (!detailList.isEmpty()) {
+
+            }
+
+        } else {
+
+        }
+        return null;
+    }
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.java
new file mode 100644
index 0000000000..bbfb978e73
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.java
@@ -0,0 +1,14 @@
+package com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Mapper
+public interface AsBusclaimInvoiceBillDetailMapper extends BaseMapper<AsBusclaimInvoiceBillDetail> {
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml
new file mode 100644
index 0000000000..a5ffcc765f
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailMapper.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetailMapper">
+</mapper>
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailRest.java
new file mode 100644
index 0000000000..25c2e92a96
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailRest.java
@@ -0,0 +1,14 @@
+package com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@RestController
+@RequestMapping("v1/AsBusclaimInvoiceBillDetail")
+public class AsBusclaimInvoiceBillDetailRest {
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailService.java
new file mode 100644
index 0000000000..4ee5584733
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebilldetail/AsBusclaimInvoiceBillDetailService.java
@@ -0,0 +1,14 @@
+package com.yxt.anrui.as.biz.asbusclaiminvoicebilldetail;
+
+import com.yxt.anrui.as.api.asbusclaiminvoicebilldetail.AsBusclaimInvoiceBillDetail;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/5/8
+ **/
+@Service
+public class AsBusclaimInvoiceBillDetailService extends MybatisBaseService<AsBusclaimInvoiceBillDetailMapper, AsBusclaimInvoiceBillDetail> {
+}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java
index 5a01e90fd6..88400fe519 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java
@@ -17,6 +17,8 @@ import java.util.List;
 public class WmsAnsBillDto {
 
     private String sid;
+    private String createBySid;
+    private String orgPath;
 
     @ApiModelProperty("外部单号（业务单据编号）")
     private String sourceBillNo;