Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
已修改4个文件
16 ■■■■ 文件已修改
multiple/assets/logo/TDDQLogo.png 补丁 | 查看 | 原始文档 | blame | 历史
multiple/config.json 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementLedger/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
multiple/assets/logo/TDDQLogo.png

multiple/config.json
@@ -134,9 +134,9 @@
  },
  "TDDQ": {
    "env": {
      "VITE_APP_TITLE": "河南同德电器有限公司",
      "VITE_BASE_API": "http://localhost:9001",
      "VITE_JAVA_API": "http://localhost:9002"
      "VITE_APP_TITLE": "河南同德电气有限公司",
      "VITE_BASE_API": "http://36.137.101.88:9001",
      "VITE_JAVA_API": "http://36.137.101.88:9002"
    },
    "logo": "logo/TDDQLogo.png",
    "favicon": "favicon/TDDQfavicon.ico"
src/views/procurementManagement/procurementLedger/index.vue
@@ -108,7 +108,7 @@
            <el-button link type="primary" @click="openForm('edit', scope.row)"
              :disabled="scope.row.stockInStatus === '完全入库'">编辑
            </el-button>
            <el-button link type="primary" @click="downloadOrder(scope.row.id)">下载</el-button>
            <el-button link type="primary" @click="openFileDialog(scope.row)">附件</el-button> <!--downloadOrder(scope.row.id) 下载-->
          </template>
        </el-table-column>
      </el-table>
@@ -137,7 +137,7 @@
          <el-col :span="12">
            <el-form-item label="供应商名称:" prop="supplierId">
              <el-select v-model="form.supplierId" placeholder="请选择" filterable clearable>
                <el-option v-for="item in supplierList" :key="item.id" :label="item.supplierName" :value="item.id">{{ item.supplierName + '---' + item.supplierType }}</el-option>
                <el-option v-for="item in supplierList" :key="item.id" :label="item.supplierName" :value="item.id">{{ item.supplierType ? item.supplierName + '---' + item.supplierType : item.supplierName }}</el-option>
              </el-select>
            </el-form-item>
          </el-col>
src/views/salesManagement/salesLedger/index.vue
@@ -249,8 +249,8 @@
            </el-button>
            <el-button link
                       type="primary"
                       @click="downloadOrder(scope.row.id)">下载
            </el-button>
                       @click="openFileDialog(scope.row)">附件
            </el-button> <!--downloadOrder(scope.row.id) 下载-->
          </template>
        </el-table-column>
      </el-table>
@@ -330,7 +330,7 @@
                           :label="item.customerName"
                           :value="item.id">
                  {{
                    item.customerName + "——" + item.taxpayerIdentificationNumber
                    item.taxpayerIdentificationNumber ? item.customerName + "——" + item.taxpayerIdentificationNumber : item.customerName
                  }}
                </el-option>
              </el-select>