暂存

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
     <el-button-group v-if="tool.checkAuth($route.name,'editBlueInvioce')" style="margin-bottom:10px">
-      <el-button size="small" type="primary" :disabled="data.status =! '提交' && data.status != '审核'" @click="addInvoiceapp">一键添加发票</el-button>
-      <el-button size="small" type="primary" :disabled="data.status =! '提交' && data.status != '审核'" @click="addInvoiceapp2">添加发票</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0 || (data.status =! '提交' && data.status != '审核') || data.byhand !== 0" @click="clickCreateBlueInvioce">勾选创建发票</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0 || (data.status =! '提交' && data.status != '审核') || data.byhand !== 0" @click="clickInvioceQuery">发票创建查询</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0 ||  (data.status =! '提交' && data.status != '审核')" @click="blueInvioceToRed">红冲勾选行</el-button>
+      <el-button size="small" type="primary" :disabled="data.status !== '提交' && data.status !== '审核'" @click="addInvoiceapp">一键添加发票</el-button>
+      <el-button size="small" type="primary" :disabled="data.status !== '提交' && data.status != '审核'" @click="addInvoiceapp2">添加发票</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 || (data.status !== '提交' && data.status != '审核') || data.byhand !== 0" @click="clickCreateBlueInvioce">勾选创建发票</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 || (data.status !== '提交' && data.status != '审核') || data.byhand !== 0" @click="clickInvioceQuery">发票创建查询</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 ||  (data.status !== '提交' && data.status != '审核')" @click="blueInvioceToRed">红冲勾选行</el-button>
     </el-button-group>
     <invoiceTable :data="data" ref="invoiceTable" @activeRow="activeRow" @selection="selection"></invoiceTable>
     <invoiceTablemx :status="data.status" ref="invoiceTablemx" @onSuccess="mxOnSuccess"></invoiceTablemx>

src/HDrpManagement/invoiceapp/index.vue

@@ -17,7 +17,7 @@
       <template #custom>
         <div class="mt-10">
           <label class="search__label">状态:</label>
-          <el-select class="inline-16" v-model="status" size="small" placeholder="请选择状态" @change="selectChange" clearable>
+          <el-select class="inline-16" v-model="q_status" size="small" placeholder="请选择状态" @change="selectChange" clearable>
             <el-option label="新建" value="新建"></el-option>
             <el-option label="提交" value="提交"></el-option>
             <el-option label="审核" value="审核"></el-option>
@@ -75,7 +75,7 @@ export default {
   data () {
     return {
       options:[],
-      status:'',
+      q_status:'',
       dateSelect:[]
     }
   },
@@ -93,7 +93,7 @@ export default {
         this.$refs.basicLayout.param.content.where.begindate = ''
         this.$refs.basicLayout.param.content.where.enddate = ''
       }
-      this.$refs['basicLayout'].param.content.where.status = this.status
+      this.$refs['basicLayout'].param.content.where.status = this.q_status
       this.$refs['basicLayout'].param.content.pageNumber = 1
       this.$refs['basicLayout'].listData()
     }

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -47,7 +47,8 @@
           label="数量"
           width="180">
           <template slot-scope="scope">
-            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.row.qty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
             <span v-else>{{scope.row.qty}}</span>
           </template>
         </el-table-column>

src/SDrpManagement/ProductGroup/index.vue

@@ -18,7 +18,7 @@
       <div class="group-list content">
         <div class="group-item" v-for="item in productGroup" :key="item.sa_itemgroupid" @click="itemClick(item)">
           <div class="top">
-            <el-image style="width:100%" :src="Object.keys(item.attinfos).length > 0 ? item.attinfos[0].url : ''" fit="cover" />
+            <el-image style="width:100%" :src="item.attinfos[0].url" fit="cover" />
           </div>
           <div class="bottom">
             <p class="title">{{item.groupname}}</p>
@@ -106,9 +106,18 @@ export default {
     async getProductGroup() {
       this.params.content.brandids = this.brandId
       let res = await this.$api.requested(this.params)
+      res.data = res.data.map(e=>{
+        if (e.attinfos.length > 0) {
+          return e
+        } else {
+          e.attinfos.push({
+            url:e.cover
+          })
+          return e
+        }
+      })
+      console.log(res.data,'--')
       this.productGroup = res.data
-      console.log(this.productGroup);
-      
       this.total = res.total
       this.currentPage = res.pageNumber
     },

vue.config.js

@@ -14,15 +14,14 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'https://122.226.136.204:8079/',  // target host
+          target: 'http://61.164.207.46:8000',  // target host*/
+          // target: 'https://122.226.136.204:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites
           pathRewrite: {
-              '^/apis': ''  // rewrite path
+            '^/apis': ''  // rewrite path
           },
-
         },
       }
     }