web100 %!s(int64=2) %!d(string=hai) anos
pai
achega
e20d99fe75

+ 1 - 1
src/api/basicData/basicStorageType.js

@@ -11,7 +11,7 @@ export function customerList(data) {
 //客户类别列表修改和新增
 export function typeSave(data) {
     return request({
-        url: '/api/blade-client/storagcangedesc/submitType',
+        url: '/api/blade-client/storagedesc/submitType',
         method: 'post',
         data: data
     })

+ 2 - 2
src/api/basicData/product.js

@@ -21,8 +21,8 @@ export const getGoodstype = () => {
 
 export const getDetails = (data) => {
     return request({
-        // url: '/api/blade-client/goodsDescParts/partsDetails',
-        url: '/api/blade-sales-part/goodsDesc/detail',
+        url: '/api/blade-client/goodsDescParts/partsDetails',
+        // url: '/api/blade-sales-part/goodsDesc/detail',
         method: 'get',
         params: data
     })

+ 5 - 1
src/views/businessManagement/deliveryNotice/index.vue

@@ -12,7 +12,7 @@
           <el-button type="info" :size="size" icon="el-icon-printer" :loading="exportLoading" @click.stop="statement">
             报表打印</el-button>
           <el-button type="warning" size="small" icon="el-icon-top" @click.stop="openExport()">导出</el-button>
-          <!-- <el-button type="danger" size="small" icon="el-icon-edit-outline" :disabled="!generateVoucher" @click="submitCredentials">生成凭证</el-button> -->
+          <el-button v-if="isUserInfo" type="danger" size="small" icon="el-icon-edit-outline" :disabled="!generateVoucher" @click="submitCredentials">生成凭证</el-button>
         </template>
         <template slot-scope="scope" slot="orgOrderNo">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">
@@ -83,6 +83,7 @@ export default {
   },
   data() {
     return {
+      isUserInfo:false,
       configuration: {
         multipleChoices: false,
         multiple: false,
@@ -123,6 +124,9 @@ export default {
     }
   },
   async created() {
+    if(this.$store.getters.userInfo.tenant_id == '681169'){
+      this.isUserInfo = true
+    }
     // this.search.businessDate = defaultDate(1)
     this.search.createTime = defaultDate(3)
     this.option = option

+ 2 - 1
src/views/businessManagement/purchaseOrder/index.vue

@@ -605,6 +605,7 @@ export default {
         }).then(() => {
           this.loading = true
           res.data.data.orgId = res.data.data.id
+          res.data.data.srcId = res.data.data.srcId
           res.data.data.deliveryStatus = '录入'
           res.data.data.salesCompany = res.data.data.belongToCorpId
           res.data.data.totalWeight = res.data.data.cartonWeight
@@ -642,7 +643,7 @@ export default {
           res.data.data.srcOrderNo = res.data.data.orgOrderNo
           delete res.data.data.debitAmount
           res.data.data.deliveryItemsList.forEach(item => item.deliveryAmount = item.amount)
-          res.data.data.srcId = generateShipmentId
+          // res.data.data.srcId = generateShipmentId
           res.data.data.purchaseAmount = generateMount
           genfactory(res.data.data).then(() => {
             this.$message.success('生成工厂发货成功')