Merge branch 'master' into 测试

src/views/shengde/group/statement/purchase/supplier.vue

@@ -36,9 +36,9 @@ export default {
   },
   created() {
     this.transferParams = this.$route.query
-    let purchaseStatus = this.constantData.filter((item) => item.type === 'purchaseStatus')
+    let purchaseStatus = this.dictData.filter((item) => item.code === 'purchaseStatus')
     if (purchaseStatus && purchaseStatus.length > 0) {
-      this.purchaseStatus = purchaseStatus[0].rows
+      this.purchaseStatus = purchaseStatus[0].children
     }
     let payType = this.dictData.filter((item) => item.code === 'purchase_payment_pay_type')
     if (payType && payType.length > 0) {
@@ -52,7 +52,7 @@ export default {
   mounted() {
     this.getList()
   },
-  computed: mapGetters(['constantData', 'dictData']),
+  computed: mapGetters([ 'dictData']),
   methods: {
     getList() {
       this.loading = true
@@ -68,7 +68,7 @@ export default {
       )
     },
     purchaseStatusFormat(row) {
-      return this.selectConstantLabel(this.purchaseStatus, row.purchaseStatus)
+      return this.selectConstantsLabel(this.purchaseStatus, row.purchaseStatus)
     },
     payTypeFormat(row) {
       return this.selectConstantsLabel(this.payType, row.payType)

src/views/shengde/group/statement/reconciliation/index.vue

@@ -9,7 +9,7 @@
       </el-form-item>
       <el-form-item label="超额出库:" prop="isExcess">
         <el-select v-model="queryParams.isExcess" placeholder="请选择超额出库" style="width: 100%" size="small" @change="handleQuery">
-          <el-option v-for="item in yesOrNoData" :key="item.key" :label="item.text" :value="item.key"> </el-option>
+          <el-option v-for="item in yesOrNoData" :key="item.dictValue" :value="item.dictKey" :label="item.dictValue" > </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="日期">
@@ -103,8 +103,7 @@ export default {
     }
   },
   created() {
-    this.yesOrNoData = this.constantData.filter((item) => item.type === 'yesOrNo')[0].rows
-    console.log(this.yesOrNoData)
+    this.yesOrNoData = this.constantData.filter((item) => item.code === 'sys_yes_no')[0].children
   },
   mounted() {
     this.timeTypeChange()

src/views/shengde/productionSystem/purchase/contract/contractList.vue

@@ -6,7 +6,7 @@
       </el-form-item>
       <el-form-item label="采购状态" prop="purchaseStatus">
         <el-select v-model="queryParams.purchaseStatus" placeholder="请选择采购状态" size="small" @change="handleQuery">
-          <el-option v-for="item in purchaseStatus" :key="item.text" :value="item.key" :label="item.text" />
+          <el-option v-for="item in purchaseStatus" :key="item.dictValue" :value="item.dictKey" :label="item.dictValue" />
         </el-select>
       </el-form-item>
       <el-form-item label="供应商" prop="supplyName">
@@ -183,9 +183,9 @@ export default {
     }
   },
   created() {
-    let purchaseStatus = this.constantData.filter((item) => item.type === 'purchaseStatus')
+    let purchaseStatus = this.dictData.filter((item) => item.code === 'purchaseStatus')
     if (purchaseStatus && purchaseStatus.length > 0) {
-      this.purchaseStatus = purchaseStatus[0].rows
+      this.purchaseStatus = purchaseStatus[0].children
     }
     let payType = this.dictData.filter((item) => item.code === 'purchase_payment_pay_type')
     if (payType && payType.length > 0) {
@@ -206,7 +206,7 @@ export default {
       this.getList()
     })
   },
-  computed: mapGetters(['constantData', 'dictData']),
+  computed: mapGetters(['dictData']),
   methods: {
     getList() {
       this.loading = true
@@ -233,10 +233,10 @@ export default {
       this.handleQuery()
     },
     purchaseStatusFormat(row) {
-      return this.selectConstantLabel(this.purchaseStatus, row.purchaseStatus)
+      return this.selectConstantsLabel(this.purchaseStatus, row.purchaseStatus)
     },
     currencyFormat(row) {
-      return this.selectConstantLabel(this.sdCurrencyType, row.currency)
+      return this.selectConstantsLabel(this.sdCurrencyType, row.currency)
     },
     payTypeFormat(row) {
       return this.selectConstantsLabel(this.payType, row.payType)

src/views/shengde/warehouse/outbound/details.vue

@@ -57,8 +57,8 @@
     </el-form>
 
     <el-row :gutter="10" style="margin-bottom: 10px">
-      <el-col :span="1.5">
-        <el-button type="primary" size="mini" @click="handleAdd" v-db-click>出库登记</el-button>
+      <el-col :span="24">
+        <el-button type="primary" size="mini" @click="handleAdd" v-if="!userInfo.subsidiaryId" v-db-click>出库登记</el-button>
         <el-button type="primary" size="mini" @click="handleExcel" v-db-click>导出Excel</el-button>
       </el-col>
     </el-row>
@@ -160,7 +160,7 @@ export default {
       this.getList()
     })
   },
-  computed: mapGetters(['dictData']),
+  computed: mapGetters(['dictData', 'userInfo']),
   methods: {
     getList() {
       this.loading = true

src/views/shengde/warehouse/outbound/single.vue

@@ -50,8 +50,8 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" style="margin-bottom: 10px">
-      <el-col :span="1.5">
+    <el-row :gutter="10" style="margin-bottom: 10px" v-if="!userInfo.subsidiaryId">
+      <el-col :span="24">
         <el-button type="primary" size="mini" @click="handleAdd" v-db-click>出库登记</el-button>
       </el-col>
     </el-row>
@@ -148,7 +148,7 @@ export default {
       this.getList()
     })
   },
-  computed: mapGetters(['dictData']),
+  computed: mapGetters(['dictData', 'userInfo']),
   methods: {
     getList() {
       this.loading = true

src/views/shengde/warehouse/putInStorage/details.vue

@@ -60,9 +60,9 @@
     </el-form>
 
     <el-row :gutter="10" style="margin-bottom: 10px">
-      <el-col :span="5">
-        <el-button type="primary" size="mini" @click="handleAdd" v-db-click>入库登记</el-button>
-        <el-button type="primary" size="mini" @click="handleTransfer" v-db-click>调拨登记</el-button>
+      <el-col :span="24">
+        <el-button type="primary" size="mini" @click="handleAdd" v-if="!userInfo.subsidiaryId" v-db-click>入库登记</el-button>
+        <el-button type="primary" size="mini" @click="handleTransfer" v-if="!userInfo.subsidiaryId" v-db-click>调拨登记</el-button>
         <el-button type="primary" size="mini" @click="handleExcel" v-db-click>导出Excel</el-button>
       </el-col>
     </el-row>
@@ -172,7 +172,7 @@ export default {
       this.getList()
     })
   },
-  computed: mapGetters(['dictData']),
+  computed: mapGetters(['dictData', 'userInfo']),
   methods: {
     getList() {
       this.loading = true

src/views/shengde/warehouse/putInStorage/single.vue

@@ -50,8 +50,8 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" style="margin-bottom: 10px">
-      <el-col :span="1.5">
+    <el-row :gutter="10" style="margin-bottom: 10px" v-if="!userInfo.subsidiaryId">
+      <el-col :span="24">
         <el-button type="primary" size="mini" @click="handleAdd" v-db-click>入库登记</el-button>
       </el-col>
     </el-row>
@@ -148,7 +148,7 @@ export default {
       this.getList()
     })
   },
-  computed: mapGetters(['dictData']),
+  computed: mapGetters(['dictData', 'userInfo']),
   methods: {
     getList() {
       this.loading = true