1

src/views/shengde/product/groupSKU/index.vue

@@ -29,8 +29,8 @@
       <el-row :gutter="10" style="margin-bottom: 10px" v-if="!userInfo.subsidiaryId">
         <el-col :span="24">
           <el-button type="primary" size="mini" @click="handleAdd">添加产品</el-button>
-          <!-- <el-button type="primary" size="mini" @click="importExcel" v-db-click>导入Excel</el-button>
-          <el-button type="primary" size="mini" @click="historyManagement" v-db-click>导入历史管理</el-button> -->
+          <el-button type="primary" size="mini" @click="importExcel" v-db-click>导入Excel</el-button>
+          <el-button type="primary" size="mini" @click="historyManagement" v-db-click>导入历史管理</el-button>
         </el-col>
       </el-row>
 

src/views/shengde/subsidiary/order/management/index.vue

@@ -170,15 +170,7 @@
           <el-button type="text" @click="handleOpenUpload(scope.row.id)" v-if="scope.row.status === 10" v-db-click>上传设计稿</el-button>
           <el-button type="text" @click="handleChangeOrder(scope.row.id)" v-if="scope.row.status === 0" v-db-click>编辑</el-button>
           <el-button type="text" v-if="scope.row.status == '30'" @click="handleAfterSales(scope.row)" v-db-click>售后</el-button>
-          <!-- <el-button type="text" style="color: rgb(217, 0, 27)" @click="handleRemove(scope.row.id)" v-if="scope.row.status == 10" v-db-click>删除</el-button> -->
-          <el-button
-            type="text"
-            style="color: rgb(217, 0, 27)"
-            @click="handleRemove(scope.row.id)"
-            v-if="scope.row.dataResource === 0 && (scope.row.status == 0 || scope.row.status == 10)"
-            v-db-click
-            >删除</el-button
-          >
+          <el-button type="text" style="color: rgb(217, 0, 27)" @click="handleRemove(scope.row.id)" v-if="scope.row.status == 10" v-db-click>删除</el-button>
         </template>
       </el-table-column>
     </el-table>

vue.config.js

@@ -57,9 +57,9 @@ module.exports = {
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
         //本地服务接口地址
-        target: 'http://www.printmat.cn:8866',
+        // target: 'http://www.printmat.cn:8866',
         // target: 'http://116.205.162.119:8866',
-        // target: 'http://192.168.1.164:8866',
+        target: 'http://192.168.1.164:8866',
         changeOrigin: true,
         pathRewrite: {
           [`^${process.env.VUE_APP_BASE_API}`]: '/',