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

src/views/purchase/PurchaseDemandList/add.vue

@@ -872,7 +872,6 @@ export default {
     },
     // 更改业务类型调整明细行内补单或紧急标识
     changeBillType(val) {
-      console.log(val)
       if (val == 'BDXQ' && this.basicForm.puDemandItemList.length != 0) {
         this.isBDXQ = true
         this.BDZT = false
@@ -888,6 +887,8 @@ export default {
       }
       if (val == 'JJXQ') {
         this.basicForm.planType = 'JJXQ'
+        // 判断需求日期
+        this.dafaultDate()
       } else {
         if (this.basicForm.planType == 'JJXQ') {
           this.basicForm.planType = ''

src/views/purchase/PurchaseDemandList/index.vue

@@ -345,7 +345,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column property="deadline" label="截止星期/月份">
+        <el-table-column property="deadline" label="截止星期">
           <template slot-scope="scope">
             <el-input-number size="mini" :min=1 :max="scope.row.ways == 'ZJH' ? 7 : 12 " v-model="scope.row.deadline" clearable @input=changeDeadline(scope.row)></el-input-number>
           </template>
@@ -356,7 +356,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <span style="color: red">注:周计划星期填写范围1-7，月计划填写范围1-12</span>
+      <!-- <span style="color: red">注:周计划星期填写范围1-7，月计划填写范围1-12</span> -->
     </el-dialog>
 
     <Add v-model="isList" v-if="!isList" :pageStu="page" :disable="disable" :row="rowDetail" @refresh="searchList"/>

vue.config.js

@@ -37,7 +37,7 @@ 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本地
@@ -45,7 +45,7 @@ module.exports = {
         // target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
         // target: `http://172.16.13.47:8000/drp-admin`, //这是一个美女的本地
         // target: `http://172.16.13.21:8000/drp-admin`, //CKF本地
-        target: `http://172.16.61.99:8000/drp-admin`, //lz's localhost
+        // target: `http://172.16.61.99:8000/drp-admin`, //lz's localhost
         //  target: `http://127.0.0.1:8000/drp-admin`,
         changeOrigin: true,
         pathRewrite: {