Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue

@@ -149,7 +149,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty">其中上装(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderMakeup.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue

@@ -146,7 +146,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty">其中上装(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderMakeup.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue

@@ -150,7 +150,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty">其中上装(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderMakeup.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue

@@ -150,7 +150,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty">其中上装(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderMakeup.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue

@@ -150,7 +150,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty">其中上装(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderMakeup.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue

@@ -146,7 +146,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty">其中上装(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderMakeup.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue

@@ -146,7 +146,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty">其中上装(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderMakeup.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue

@@ -146,7 +146,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty">其中上装(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderMakeup.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue

@@ -146,7 +146,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty">其中上装(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderMakeup.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-riskcenter-ui/src/components/publicPage/salesOrder.vue

@@ -146,7 +146,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty">其中上装(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderMakeup.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-riskcenter-ui/src/views/workFlow/publicPage/salesOrder.vue

@@ -146,7 +146,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty">其中上装(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderMakeup.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-scm/anrui-scm-ui/src/components/publicPage/saleOrder.vue

@@ -146,7 +146,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty">其中上装(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderMakeup.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

anrui-scm/anrui-scm-ui/src/views/workFlow/publicPage/xiaoshoudingdanInfo.vue

@@ -146,7 +146,7 @@
             </el-col>
             <el-col :span="6">
               <div class="span-sty">其中上装(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderMakeup.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>

yxt-as-ui/src/api/goods/brand.js

@@ -1,7 +1,6 @@
 import request from '@/utils/request'
 
 export default {
-
   // 查询分页列表
   listPage: function(params) {
     return request({
@@ -13,28 +12,20 @@ export default {
       }
     })
   },
-
   // 品牌查询
   getAllBrand: function(params) {
     return request({
       url: '/yxtbase/apiadmin/base/basegoodsbrand/listAll',
-     method: 'post',
-     data: params,
-     headers: {
-       'Content-Type': 'application/json'
-     }
+      method: 'get',
+      params: params
     })
   },
-
-
   // 修改是否可用状态
-  updateIsEnable: function(sid,isEnable) {
-  	return request({
-  		url: '/yxtbase/apiadmin/base/basegoodsbrand/updateIsEnable/'+sid+"/"+isEnable
-  	});
+  updateIsEnable: function(sid, isEnable) {
+    return request({
+      url: '/yxtbase/apiadmin/base/basegoodsbrand/updateIsEnable/' + sid + '/' + isEnable
+    })
   },
-
-
   // 新增、保存
   saveBrands: function(data) {
     return request({
@@ -44,19 +35,15 @@ export default {
       headers: {
         'Content-Type': 'application/json'
       }
-    });
+    })
   },
-
   // 初始化
   initBrands: function(data) {
     return request({
       url: '/yxtbase/apiadmin/base/basegoodsbrand/initialization/' + data,
       method: 'get'
-    });
+    })
   },
-
-
-
   // 品牌-- 删除
   deleteBySids: function(data) {
     return request({
@@ -67,8 +54,5 @@ export default {
         'Content-Type': 'application/json'
       }
     })
-  },
-
-
-
+  }
 }

yxt-as-ui/src/api/goods/category.js

@@ -1,78 +1,65 @@
 import request from '@/utils/request'
 
 export default {
+    // 查询分页列表
+    listPage: function(params) {
+        return request({
+            url: '/yxtbase/apiadmin/base/basegoodstype/listPage',
+            method: 'post',
+            data: params,
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        })
+    },
+    // 类别查询
+    getAllType: function(params) {
+        return request({
+            url: '/yxtbase/apiadmin/base/basegoodstype/listAll',
+            method: 'get',
+            params: params
+        })
+    },
+    // 修改是否可用状态
+    updateIsEnable: function(sid, isEnable) {
+        return request({
+            url: '/yxtbase/apiadmin/base/basegoodstype/updateIsEnable/' + sid + '/' + isEnable
+        })
+    },
+    // 修改是否一品一码
+    updateIsGoodsID: function(sid, isGoodsID) {
+        return request({
+            url: '/yxtbase/apiadmin/base/basegoodstype/updateIsGoodsID/' + sid + '/' + isGoodsID
+        })
+    },
+    // 新增、保存
+    saveTypes: function(data) {
+        return request({
+            url: '/yxtbase/apiadmin/base/basegoodstype/saveOrUpdate',
+            method: 'post',
+            data: data,
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        })
+    },
 
-  // 查询分页列表
-  listPage: function(params) {
-    return request({
-      url: '/yxtbase/apiadmin/base/basegoodstype/listPage',
-      method: 'post',
-      data: params,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-
-  // 类别查询
-  getAllType: function(params) {
-    return request({
-      url: '/yxtbase/apiadmin/base/basegoodstype/listAll',
-     method: 'post',
-     data: params,
-     headers: {
-       'Content-Type': 'application/json'
-     }
-    })
-  },
-
-
-  // 修改是否可用状态
-  updateIsEnable: function(sid, isEnable) {
-    return request({
-      url: '/yxtbase/apiadmin/base/basegoodstype/updateIsEnable/' + sid + "/" + isEnable
-    });
-  },
-
-  // 修改是否一品一码
-  updateIsGoodsID: function(sid, isGoodsID) {
-    return request({
-      url: '/yxtbase/apiadmin/base/basegoodstype/updateIsGoodsID/' + sid + "/" + isGoodsID
-    });
-  },
-
-  // 新增、保存
-  saveTypes: function(data) {
-    return request({
-      url: '/yxtbase/apiadmin/base/basegoodstype/saveOrUpdate',
-      method: 'post',
-      data: data,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    });
-  },
-
-  // 初始化
-  initTypes: function(data) {
-    return request({
-      url: '/yxtbase/apiadmin/base/basegoodstype/initialization/' + data,
-      method: 'get'
-    });
-  },
-
-
-
-  // 类别-- 删除
-  deleteBySids: function(data) {
-    return request({
-      url: '/yxtbase/apiadmin/base/basegoodstype/delBySids',
-      method: 'DELETE',
-      data: data,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-
+    // 初始化
+    initTypes: function(data) {
+        return request({
+            url: '/yxtbase/apiadmin/base/basegoodstype/initialization/' + data,
+            method: 'get'
+        })
+    },
+    // 类别-- 删除
+    deleteBySids: function(data) {
+        return request({
+            url: '/yxtbase/apiadmin/base/basegoodstype/delBySids',
+            method: 'DELETE',
+            data: data,
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        })
+    }
 }

yxt-as-ui/src/api/goods/factory.js

@@ -1,7 +1,6 @@
 import request from '@/utils/request'
 
 export default {
-
   // 查询分页列表
   listPage: function(params) {
     return request({
@@ -13,27 +12,20 @@ export default {
       }
     })
   },
-
- // 厂家查询
+  // 厂家查询
   getAllFacturer: function(params) {
     return request({
       url: '/yxtbase/apiadmin/base/basemanufacturer/listAll',
-     method: 'post',
-     data: params,
-     headers: {
-       'Content-Type': 'application/json'
-     }
+      method: 'get',
+      params: params
     })
   },
-
   // 修改是否可用状态
-  updateIsEnable: function(sid,isEnable) {
-  	return request({
-  		url: '/yxtbase/apiadmin/base/basemanufacturer/updateIsEnable/'+sid+"/"+isEnable
-  	});
+  updateIsEnable: function(sid, isEnable) {
+    return request({
+      url: '/yxtbase/apiadmin/base/basemanufacturer/updateIsEnable/' + sid + '/' + isEnable
+    })
   },
-
-
   // 新增、保存
   saveFacturer: function(data) {
     return request({
@@ -43,18 +35,16 @@ export default {
       headers: {
         'Content-Type': 'application/json'
       }
-    });
+    })
   },
-
   // 初始化
   initFacturer: function(data) {
     return request({
       url: '/yxtbase/apiadmin/base/basemanufacturer/initialization/' + data,
       method: 'get'
-    });
+    })
   },
-
- // 厂家-- 删除
+  // 厂家-- 删除
   deleteBySids: function(data) {
     return request({
       url: '/yxtbase/apiadmin/base/basemanufacturer/delBySids',
@@ -64,7 +54,5 @@ export default {
         'Content-Type': 'application/json'
       }
     })
-  },
-
-
+  }
 }

yxt-as-ui/src/api/goods/unit.js

@@ -1,7 +1,6 @@
 import request from '@/utils/request'
 
 export default {
-
   // 查询分页列表
   listPage: function(params) {
     return request({
@@ -13,28 +12,20 @@ export default {
       }
     })
   },
-
   // 单位查询
   getAllUnit: function(params) {
     return request({
       url: '/yxtbase/apiadmin/base/basegoodsunit/listAll',
-    method: 'post',
-    data: params,
-    headers: {
-      'Content-Type': 'application/json'
-    }
+      method: 'get',
+      params: params
     })
   },
-
-
   // 修改是否可用状态
-  updateIsEnable: function(sid,isEnable) {
-  	return request({
-  		url: '/yxtbase/apiadmin/base/basegoodsunit/updateIsEnable/'+sid+"/"+isEnable
-  	});
+  updateIsEnable: function(sid, isEnable) {
+    return request({
+      url: '/yxtbase/apiadmin/base/basegoodsunit/updateIsEnable/' + sid + '/' + isEnable
+    })
   },
-
-
   // 新增、保存
   saveUnits: function(data) {
     return request({
@@ -44,18 +35,16 @@ export default {
       headers: {
         'Content-Type': 'application/json'
       }
-    });
+    })
   },
-
   // 初始化
   initUnits: function(data) {
     return request({
       url: '/yxtbase/apiadmin/base/basegoodsunit/initialization/' + data,
       method: 'get'
-    });
+    })
   },
-
- // 单位-- 删除
+  // 单位-- 删除
   deleteBySids: function(data) {
     return request({
       url: '/yxtbase/apiadmin/base/basegoodsunit/delBySids',
@@ -65,6 +54,5 @@ export default {
         'Content-Type': 'application/json'
       }
     })
-  },
-
+  }
 }

yxt-as-ui/src/views/goods/category/categoryAdd.vue

@@ -211,11 +211,7 @@
     methods: {
       initData() {
         console.log('>>>>>>>>>initData')
-       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) }
 
         req.getAllType(parpams).then(resp => {
           this.goodsTypeList = resp.data

yxt-as-ui/src/views/goods/goods/goodsAdd2.vue

@@ -305,6 +305,7 @@ export default {
         this.$refs['form_obj'].clearValidate()
       })
       this.formobj.userSid = userSid
+      this.formobj.useOrgSid = deptSid
       this.formobj.createOrgSid = orgSid
       this.initData(deptSid)
     },

yxt-as-ui/src/views/goods/goods/index.vue

@@ -231,29 +231,22 @@
     },
     methods: {
       initData() {
-        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 => {
           console.log('>>>>>>>>>getAllBrand', resp)
           this.brandList = resp.data
         }).catch(() => {})
-
         // 类别
         req3.getAllType(parpams).then(resp => {
           console.log('>>>>>>>>>getAllType', resp)
           this.goodsTypeList = resp.data
         }).catch(() => {})
-
         // 厂家
         req4.getAllFacturer(parpams).then(resp => {
           console.log('>>>>>>>>>getAllFacturer', resp)
           this.facturerList = resp.data
         }).catch(() => {})
-
       },
 
       selectBrandChange(val) {

yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue

@@ -546,7 +546,7 @@ export default {
     selectProducts() {
       this.viewState = 2
       const aa = []
-      this.$refs['divSp'].showData(aa, this.formobj.deptSid)
+      this.$refs['divSp'].showData(aa, this.formobj.createBySid, this.formobj.createOrgSid, this.formobj.deptSid)
     },
     backData(value) {
       this.viewState = 1

yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="app-container">
-    <div>
+    <div v-show="viewState == 1">
       <div class="tab-header webtop">
         <div>选择商品</div>
         <div>
-          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <el-button type="primary" size="small" @click="toConfirm">确定</el-button>
+          <el-button type="primary" size="small" @click="addProducts">新增商品</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -51,26 +52,32 @@
         </div>
       </div>
     </div>
+    <goodsAdd2 v-show="viewState == 2" ref="divAdd" @reloadlist="getList" @doback="resetState" />
   </div>
 </template>
 
 <script>
 import Pagination from '@/components/pagination'
 import { chooseproducts } from '@/api/Common/dictcommons'
+import goodsAdd2 from '@/views/goods/goods/goodsAdd2'
 
 export default {
   name: 'SelectVehicle',
   components: {
-    Pagination
+    Pagination,
+    goodsAdd2
   },
   data() {
     return {
+      viewState: 1,
       isSearchShow: false,
       searchxianshitit: '隐藏查询条件',
       tableKey: 0,
       sids: [],
       list: [],
-      number: '',
+      userSid: '',
+      createOrgSid: '',
+      deptSid: '',
       listLoading: false,
       listQuery: {
         current: 1,
@@ -129,7 +136,7 @@ export default {
     handleSelectionChange(row) {
       this.sids = row
     },
-    showData(value, useOrgSid) {
+    showData(value, userSid, createOrgSid, deptSid) {
       // const aa = []
       // if (value.length > 0) {
       //   for (var i = 0; i < value.length; i++) {
@@ -139,20 +146,30 @@ export default {
       // } else {
       //   this.listQuery.params.saleVehSids = []
       // }``
-      this.listQuery.params.useOrgSid = useOrgSid
+      this.userSid = userSid
+      this.createOrgSid = createOrgSid
+      this.deptSid = deptSid
+      this.listQuery.params.useOrgSid = deptSid
       this.listQuery.current = 1
       this.listQuery.size = 5
       this.listQuery.total = 0
       this.getList()
     },
     // 添加修改返回
-    AddUpdateReturn() {
+    toConfirm() {
       if (this.sids.length > 0) {
         this.$emit('backData', this.sids)
       } else {
         this.$notify({ title: '提示', message: '请至少选择一条记录进行操作', type: 'error', duration: 2000 })
       }
     },
+    addProducts() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd(this.userSid, this.createOrgSid, this.deptSid)
+    },
+    resetState() {
+      this.viewState = 1
+    },
     // 返回
     handleReturn() {
       this.$emit('doback')

yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue

@@ -537,7 +537,7 @@ export default {
     selectProducts() {
       this.viewState = 2
       const aa = []
-      this.$refs['divSp'].showData(aa, this.formobj.deptSid)
+      this.$refs['divSp'].showData(aa, this.formobj.createBySid, this.formobj.createOrgSid, this.formobj.deptSid)
     },
     backData(value) {
       this.viewState = 1

yxt-as-ui/src/views/workFlow/caigouFlow/relation/chooseproducts.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="app-container">
-    <div>
+    <div v-show="viewState == 1">
       <div class="tab-header webtop">
         <div>选择商品</div>
         <div>
-          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <el-button type="primary" size="small" @click="toConfirm">确定</el-button>
+          <el-button type="primary" size="small" @click="addProducts">新增商品</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -51,26 +52,32 @@
         </div>
       </div>
     </div>
+    <goodsAdd2 v-show="viewState == 2" ref="divAdd" @reloadlist="getList" @doback="resetState" />
   </div>
 </template>
 
 <script>
 import Pagination from '@/components/pagination'
 import { chooseproducts } from '@/api/Common/dictcommons'
+import goodsAdd2 from '@/views/goods/goods/goodsAdd2'
 
 export default {
   name: 'SelectVehicle',
   components: {
-    Pagination
+    Pagination,
+    goodsAdd2
   },
   data() {
     return {
+      viewState: 1,
       isSearchShow: false,
       searchxianshitit: '隐藏查询条件',
       tableKey: 0,
       sids: [],
       list: [],
-      number: '',
+      userSid: '',
+      createOrgSid: '',
+      deptSid: '',
       listLoading: false,
       listQuery: {
         current: 1,
@@ -129,7 +136,7 @@ export default {
     handleSelectionChange(row) {
       this.sids = row
     },
-    showData(value, useOrgSid) {
+    showData(value, userSid, createOrgSid, deptSid) {
       // const aa = []
       // if (value.length > 0) {
       //   for (var i = 0; i < value.length; i++) {
@@ -139,20 +146,30 @@ export default {
       // } else {
       //   this.listQuery.params.saleVehSids = []
       // }``
-      this.listQuery.params.useOrgSid = useOrgSid
+      this.userSid = userSid
+      this.createOrgSid = createOrgSid
+      this.deptSid = deptSid
+      this.listQuery.params.useOrgSid = deptSid
       this.listQuery.current = 1
       this.listQuery.size = 5
       this.listQuery.total = 0
       this.getList()
     },
     // 添加修改返回
-    AddUpdateReturn() {
+    toConfirm() {
       if (this.sids.length > 0) {
         this.$emit('backData', this.sids)
       } else {
         this.$notify({ title: '提示', message: '请至少选择一条记录进行操作', type: 'error', duration: 2000 })
       }
     },
+    addProducts() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd(this.userSid, this.createOrgSid, this.deptSid)
+    },
+    resetState() {
+      this.viewState = 1
+    },
     // 返回
     handleReturn() {
       this.$emit('doback')