Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/views/business/spd/bo/contact/contactList.vue

@@ -42,7 +42,8 @@
           <dict-tag :options="dict.type.mk_bo_contact_state" :value="scope.row.state"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" v-if="this.source == 'BoDetails' ? this.bo.winningState == 0 ? true : false : true">
+      <!-- v-if="this.source == 'BoDetails' ? this.bo.winningState == 0 ? true : false : true" -->
+      <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" >
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/purchase/PurchaseDemandList/reserved.vue

@@ -18,12 +18,12 @@
         </template>
         {{ resData.source }}
       </el-descriptions-item>
-      <el-descriptions-item>
+      <!-- <el-descriptions-item>
         <template slot="label">
           客户
         </template>
         {{ resData.customer }}
-      </el-descriptions-item>
+      </el-descriptions-item> -->
       <el-descriptions-item>
         <template slot="label">
           客户名称

src/views/purchase/purchase-order/add/column.js

@@ -421,7 +421,7 @@ export const Columns = [
     valueFormat: "yyyy-MM-dd",
     isShow:false,
   },
-  { key: "approver", title: "审批人", inputType: "Input", isShow:false, },
+  { key: "approverName", title: "审批人", inputType: "Input", isShow:false, },
   {
     key: "approverFinishTime",
     title: "审批时间",

src/views/purchase/purchase-order/column.js

@@ -132,7 +132,7 @@ export const TableColumns = [
   { key: "createByName", title: "创建人" ,width:100,},
   { key: "createTime", title: "制单日期/创建时间", },
   { key: "approveTime", title: "提交时间" ,width:100,},
-  { key: "approver", title: "审批人" ,width:100,},
+  { key: "approverName", title: "审批人" ,width:100,},
   { key: "approverFinishTime", title: "审批时间",width:100, },
   { key: "updateByName", title: "更新人" ,width:100,},
   { key: "updateTime", title: "最后修改时间" },

vue.config.js

@@ -37,13 +37,13 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://172.16.100.107:8080/drp-admin`, //测试
-        // target: `http://test-sy.derom.com/drp-admin`, //测试
+        target: `http://test-sy.derom.com/drp-admin`, //测试
         // target: `http://release-sy.derom.com/drp-admin`, //预发
         // target: `http://sy.derom.com/drp-admin`, //生产
         // target: `http://172.16.63.202:8000/drp-admin`, // D本地
         // target: `http://172.16.62.241:8000/drp-admin`, //笑寒本地
         // target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
-        target: `http://172.16.13.47:8000/drp-admin`, //这是一个美女的本地
+        // target: `http://172.16.13.47:8000/drp-admin`, //这是一个美女的本地
         // target: `http://172.16.13.113:8000/drp-admin`, //DWT本地
         // target: `http://172.16.13.77:8000/drp-admin`, //TQ本地
         // target: `http://172.16.13.21:8000/drp-admin`, // 雪豹的本地