Merge remote-tracking branch 'origin/master'

xyc

2024-08-16 33246bb56e05b273944ec1cc03a58dc112e48848

 web/src/views/modules/basicInfo/XhProductModel.vue

@@ -20,7 +20,7 @@
              <el-form-item>
                <zt-button v-if="productType && productType!=='10'" type="query" @click="table.query()"/>
                <zt-button v-if="productType && productType!=='10'" type="add" @click="add()"/>
                <zt-button v-if="productType==='1'" size="small" type="primary" @click="exportProduct()">导出模板
                <zt-button v-if="productType==='1'" size="small" type="primary" @click="exportProduct()">下载模板
                </zt-button>
                <zt-button v-if="productType==='3'" type="primary" @click="addCell()">新增虚单元</zt-button>
                <zt-button v-if="productType && productType!=='10'" type="delete" @click="table.deleteHandle()"/>
@@ -70,8 +70,8 @@
    data() {
      return {
        url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getSvgImage?token=${Cookies.get('token')}&id=`,
        productType: '',
        shipId: '',
        namePath:'',
        dataForm: {
          name: '',
          type: '',
@@ -93,11 +93,13 @@
    methods: {
      add() {
        this.dataForm.type = this.productType

        if (this.dataForm.type !== '1') {
          this.$refs.SelectTyModel.$refs.dialog.init(null, {
            type: this.dataForm.type,
            id: this.dataForm.pid,
            shipId: this.shipId
            shipId: this.shipId,
            namePath: this.namePath
          })
        } else {
          this.$refs.AddOrUpdate.$refs.dialog.init(null, {id: null, type: 'zt', pid: this.dataForm.pid})
@@ -124,16 +126,15 @@
        }
      },
      onProductSelected(data) {
        console.log(data, 'onProductSelected')
        this.shipId = data.shipId
        this.dataForm.pid = data.id
        this.dataForm.type = data.productType
        this.productType = data.productType
        this.namePath = data.namePath
        console.log(data.namePath,'data.namePath')
        if (data.productType !== '10') {
          this.$refs.tableObj.query()
        }
        console.log(data.productType, ' data.productType')
        console.log(this.productType, ' data.productType')
      },
      importData(row) {
        this.$refs.ProductImport.$refs.dialog.init(row)
@@ -143,8 +144,8 @@
      },
      onDefault(defaultId) {
        this.dataForm.pid = defaultId
        this.dataForm.type = 2
        this.productType = 2
        this.dataForm.type = '1'
        this.productType = '1'
        this.$refs.tableObj.query()
      },
    }