Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!250

src/views/purchase/DemandSummary/add.vue

@@ -82,7 +82,7 @@
         <el-table-column show-overflow-tooltip label="供应货位" align="center" prop="lastAllocationName" width="150"/>
         <el-table-column show-overflow-tooltip label="默认采购组织" align="center" prop="orgName" width="280px">
           <template slot-scope="scope">
-              <el-input clearable :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.orgName" @clear="clean(scope.row, '默认采购组织')" @focus="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')">
+              <el-input :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.orgName" @clear="clean(scope.row, '默认采购组织')" @focus="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')">
                 <el-button size="mini" :disabled="scope.row.status !== '1' || lineDisable" slot="append" icon="el-icon-more" @click="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')"></el-button>
               </el-input>
           </template>
@@ -143,7 +143,7 @@
 
     <div class="btn_group">
       <el-col :span="1.5">
-        <el-button size="mini" plain @click="back">返回</el-button>
+        <el-button size="mini" plain @click="back" v-if="lineDisable">返回</el-button>
       </el-col>
     </div>
 

src/views/purchase/PurchaseDemandList/add.vue

@@ -127,17 +127,20 @@
             </el-form-item>
          </el-col>
 
-          <!-- <el-col :span="1.5">
-            <el-form-item label="是否处理需求">
-              <el-input
-                v-model="basicForm.isProcess"
-                size="mini"
-                placeholder=""
+          <el-col :span="1.5">
+            <el-form-item label="制单日期" prop="createTime">
+              <el-date-picker
+                v-model="basicForm.createTime"
+                :disabled="sonDisable"
                 clearable
+                type="date"
+                value-format="yyyy-MM-dd"
+                size="mini"
                 style="width: 200px"
-              />
+              >
+              </el-date-picker>
             </el-form-item>
-         </el-col> -->
+         </el-col>
 
           <el-col :span="1.5">
             <el-form-item label="备注">
@@ -298,6 +301,20 @@
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column show-overflow-tooltip label="是否客户指定" align="center"  prop="isSpeical" width="100px">
+            <template slot-scope="scope">
+              <el-form-item class="hang">
+                <el-switch
+                  v-model="scope.row.isSpeical"
+                  disabled
+                  active-value="Y"
+                  inactive-value="N"
+                  active-color="#13ce66"
+                  inactive-color="#a1a3a9">
+                </el-switch>
+              </el-form-item>
+            </template>
+          </el-table-column>
           <el-table-column show-overflow-tooltip label="补单标识" align="center"  prop="isReplenishment" width="100px">
             <template slot-scope="scope">
               <el-form-item class="hang">
@@ -374,7 +391,7 @@
               <el-form-item class="hang">
                 <el-switch
                   v-model="scope.row.isUrgency"
-                  disabled
+                  :disabled="sonDisable"
                   active-value="Y"
                   inactive-value="N"
                   active-color="#13ce66"
@@ -616,11 +633,13 @@ export default {
         demandPersonal: '',
         demandDept: '',
         demandDate: '',
+        createTime: '',
         source: '4',
         billType: 'ZQBH',
         isSpeical: 'N',
         isProcess: '',
         isMonthleyCalculate: '',
+        createTime: this.parseTime(new Date().getTime()),
         remark: '',
         puDemandItemList: []
       },
@@ -917,6 +936,7 @@ export default {
         isUrgency: this.basicForm.billType == 'JJXQ' ? 'Y' : 'N',
         isReplenishment: this.basicForm.billType == 'BDXQ'? 'Y': 'N',
         isBatchLock: 'N',
+        isCustomerSpecified: '',
         remark: null,
         puRemark: null,
         lastWarehouseQty: null,
@@ -1261,6 +1281,7 @@ export default {
               isUrgency: this.basicForm.billType == 'JJXQ' ? 'Y' : 'N',
               isReplenishment: this.basicForm.billType == 'BDXQ' ? 'Y' : 'N',
               isBatchLock: 'N',
+              isCustomerSpecified: '',
               remark: null,
               puRemark: null,
               lastWarehouseQty: null,

src/views/purchase/PurchaseDemandList/index.vue

@@ -200,7 +200,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="queryParams.pageNum"
-          :page-sizes="[10, 15, 20]"
+          :page-sizes="[10, 20 ,50 ,100 ,300]"
           :page-size="100"
           layout="total, sizes, prev, pager, next, jumper"
           :total=total>