暂存

src/HDrpManagement/invoiceapp/detail/detail.vue

@@ -19,7 +19,7 @@
       <div slot="customOperation" >
         <el-button v-if="tool.checkAuth($route.name,'submit')" type="primary" size="mini" @click="submitInvoice" :disabled="mainData.status !== '新建' && mainData.status !== '提交'">{{mainData.status ==='新建'?'提交':'撤回'}}</el-button>
         <el-button v-if="tool.checkAuth($route.name,'check')" type="primary" size="mini" @click="checkInvoice" :disabled="mainData.status !== '提交' && mainData.status !== '审核'">{{mainData.status === '审核'?'反审核':'审核'}}</el-button>
-        <el-button v-if="tool.checkAuth($route.name,'toManual')" type="primary" size="mini" class="inline-16" :disabled="mainData.byhand === 1 || mainData.status !== '新建'" @click="toManual">转手工</el-button>
+        <el-button v-if="tool.checkAuth($route.name,'toManual')" type="primary" size="mini" class="inline-16" :disabled="mainData.byhand === 1 || mainData.status !== '新建' && mainData.status !== '提交'" @click="toManual">转手工</el-button>
       </div>
       <div slot="slot0" >
         <invoiceOrder :status="mainData.status" :sys_enterpriseid="mainData.sys_enterpriseid"></invoiceOrder>

src/HDrpManagement/orderManage/details/index.vue

@@ -299,7 +299,7 @@ export default {
         },
         {
           label:'erp单号',
-          value:this.mainData.erperpbillno
+          value:this.mainData.erpbillno
         },
         {
           label:'项目备注',

src/HManagement/clueManage/clue_public/modules/distribution_saler.vue

@@ -6,7 +6,7 @@
         <p class="normal-title" style="margin-bottom:16px">自动分配</p>
         <p class="normal-margin">总共:&nbsp;{{total}}条</p>
         <p class="tips normal-margin">注：1、未匹配业务员的线索，分配时，系统将自动跳过，不予以分配；2、所属业务员有且仅有一个匹配结果。</p>
-        <tableLayout :layout="tablecols" :data="list" :custom="true" :height="tableHieght">
+        <tableLayout :layout="tablecols" :data="list" :custom="true" :height="tableHieght" :fixed="'operation'">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname === 'sales'">
               <div v-if="scope.column.data.sales.length > 0">

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -48,7 +48,7 @@
       </el-table-column>
       <el-table-column
           label="规格"
-          prop="model">
+          prop="spec">
         <template slot-scope="scope">
           <p><span>{{scope.row.spec}}</span></p>
         </template>

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8000',  // target host*/
-          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          // target: 'http://61.164.207.46:8000',  // target host*/
+          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites