diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue
index c201e6c07d..04460046e3 100644
--- a/yxt-as-ui/src/views/goods/goods/goodsAdd.vue
+++ b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue
@@ -135,7 +135,7 @@
           <el-col :span="12">
             <div class="span-sty">是否上架</div>
             <el-form-item>
-              <el-radio-group v-model="formobj.isListed" size="small"  style="margin-left: 120px;">
+              <el-radio-group v-model="formobj.isListed" size="small" style="margin-left: 120px;">
                 <el-radio :label="'1'">上架</el-radio>
                 <el-radio :label="'2'">下架</el-radio>
               </el-radio-group>
@@ -373,7 +373,8 @@
             <el-col :span="8">
               <div class="span-sty">是否原厂</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isOriginalFactory" :disabled="true" size="small" style="margin-left: 120px;">
+                <el-radio-group v-model="itemInfo.isOriginalFactory" :disabled="true" size="small"
+                  style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -387,7 +388,8 @@
             <el-col :span="8">
               <div class="span-sty">是否库存警戒</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isInventoryAlert" :disabled="true" size="small" style="margin-left: 120px;">
+                <el-radio-group v-model="itemInfo.isInventoryAlert" :disabled="true" size="small"
+                  style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -473,7 +475,8 @@
             <el-col :span="8">
               <div class="span-sty">是否积分兑换</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isIntegralExchange" :disabled="true" size="small" style="margin-left: 120px;">
+                <el-radio-group v-model="itemInfo.isIntegralExchange" :disabled="true" size="small"
+                  style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -494,7 +497,8 @@
             <el-col :span="8">
               <div class="span-sty">锁定销售价格</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small"  style="margin-left: 120px;">
+                <el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small"
+                  style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -567,7 +571,7 @@
             <el-col :span="8">
               <div class="span-sty">是否原厂</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isOriginalFactory" size="small"  style="margin-left: 120px;">
+                <el-radio-group v-model="itemInfo.isOriginalFactory" size="small" style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -676,7 +680,7 @@
             <el-col :span="8">
               <div class="span-sty">是否积分兑换</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isIntegralExchange" size="small"  style="margin-left: 120px;">
+                <el-radio-group v-model="itemInfo.isIntegralExchange" size="small" style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -698,7 +702,7 @@
             <el-col :span="8">
               <div class="span-sty">锁定销售价格</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isLockingSalesPrice" size="small"  style="margin-left: 120px;">
+                <el-radio-group v-model="itemInfo.isLockingSalesPrice" size="small" style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -782,9 +786,10 @@
             goodsDescription: ""
           },
           baseGoodsSkus: [],
-          useOrgSid: window.sessionStorage.getItem('departmentSid'),
+          useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
           orgPath: window.sessionStorage.getItem('defaultOrgPath'),
-          createOrgSid: window.sessionStorage.getItem('orgSid'),
+          createOrgSid:'',
           userSid: window.sessionStorage.getItem('userSid'),
         },
         brandList: [],
@@ -800,16 +805,31 @@
       }
     },
     created() {
-      this.initData()
+      // this.initData()
     },
     methods: {
       initData() {
 
-        var parpams = {
-          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
-          userSid: window.sessionStorage.getItem('userSid'),
-          menuUrl: this.$route.path
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.formobj.createOrgSid = res.data
+          }
+        })
+
+
+        // var parpams = {
+        //   orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        //   userSid: window.sessionStorage.getItem('userSid'),
+        //   menuUrl: this.$route.path
+        // }
+
+        var parpams ={
+          useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1)
         }
+
         req2.getAllBrand(parpams).then(resp => {
           this.brandList = resp.data
         })
@@ -874,14 +894,16 @@
             goodsDescription: ""
           },
           baseGoodsSkus: [],
-          useOrgSid: window.sessionStorage.getItem('departmentSid'),
-          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
-          createOrgSid: window.sessionStorage.getItem('orgSid'),
-          userSid: window.sessionStorage.getItem('userSid'),
+        useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+          .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+        orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        createOrgSid:'',
+        userSid: window.sessionStorage.getItem('userSid'),
         }
         this.$emit('doback')
       },
       showAdd() {
+        this.initData()
         var sid = require('uuid').v1()
         console.log('>>>>>>>>>showAdd', sid)
 
@@ -895,7 +917,7 @@
         return index + 1
       },
       showEdit(row) {
-
+        this.initData()
         this.$nextTick(() => {
           this.$refs['form_obj'].clearValidate()
         })
diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue
index 0fb4199555..24d584ac86 100644
--- a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue
+++ b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue
@@ -117,8 +117,8 @@
           <el-col :span="6">
             <div class="span-sty">原厂标志</div>
             <el-form-item>
-              <el-radio-group v-model="formobj.isOriginalFactory" size="medium"
-                style="margin-left: 120px;" @change="selectIsOriginalFactory">
+              <el-radio-group v-model="formobj.isOriginalFactory" size="medium" style="margin-left: 120px;"
+                @change="selectIsOriginalFactory">
                 <el-radio :label="'1'">是</el-radio>
                 <el-radio :label="'2'">否</el-radio>
               </el-radio-group>
@@ -170,7 +170,7 @@
           <el-col :span="6">
             <div class="span-sty">锁定销售定价</div>
             <el-form-item>
-              <el-radio-group v-model="formobj.isLockingSalesPrice" size="small"  style="margin-left: 120px;"
+              <el-radio-group v-model="formobj.isLockingSalesPrice" size="small" style="margin-left: 120px;"
                 @change="selectIsLockingSalesPrice">
                 <el-radio :label="'1'">是</el-radio>
                 <el-radio :label="'2'">否</el-radio>
@@ -243,8 +243,10 @@
         submitdisabled: false,
         formobj: {
           "sid": "",
-          "userSid": window.sessionStorage.getItem('userSid'),
-          "orgPath": window.sessionStorage.getItem('orgSidPath'),
+          "userSid": '',
+          "orgPath": '',
+          'useOrgSid': '',
+          'createOrgSid': '',
           "goodsName": "",
           "goodsCode": "",
           "goodsPY": "",
@@ -326,7 +328,7 @@
       }
     },
     created() {
-      this.initData()
+      // this.initData()
     },
     methods: {
 
@@ -343,11 +345,26 @@
 
       },
       initData() {
+
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.formobj.createOrgSid = res.data
+          }
+        })
+
+        // var parpams = {
+        //   orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        //   userSid: window.sessionStorage.getItem('userSid'),
+        //   menuUrl: this.$route.path
+        // }
+
         var parpams = {
-          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
-          userSid: window.sessionStorage.getItem('userSid'),
-          menuUrl: this.$route.path
+          useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1)
         }
+
         req2.getAllBrand(parpams).then(resp => {
           this.brandList = resp.data
         })
@@ -396,8 +413,10 @@
         if (isreload === 'true') this.$emit('reloadlist')
         this.formobj = {
           "sid": "",
-          "userSid": window.sessionStorage.getItem('userSid'),
-          "orgPath": window.sessionStorage.getItem('orgSidPath'),
+          "userSid": '',
+          "orgPath": '',
+          'useOrgSid': '',
+          'createOrgSid': '',
           "goodsName": "",
           "goodsCode": "",
           "goodsPY": "",
@@ -433,17 +452,18 @@
         // console.log('>>>>>>>>>showAdd', sid)
 
         // this.formobj.sid = sid
-
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
+        this.initData()
+        this.formobj.userSid = window.sessionStorage.getItem('userSid'),
+          this.$nextTick(() => {
+            this.$refs['form_obj'].clearValidate()
+          })
 
       },
       indexMethod(index) {
         return index + 1
       },
       showEdit(row) {
-
+        this.initData()
         this.$nextTick(() => {
           this.$refs['form_obj'].clearValidate()
         })