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

src/views/purchase/PurchaseDemandList/add.vue

@@ -368,7 +368,7 @@
           <el-table-column show-overflow-tooltip label="默认采购组织编码" align="center"  prop="puOrg" width="200px"/>
           <!-- <el-table-column show-overflow-tooltip label="末级供应调拨待入量" align="center"  prop="lastStockQty" width="150px"/> -->
           <!-- <el-table-column show-overflow-tooltip label="上级供应中心现存量" align="center"  prop="superiorCenterQty" width="200px"/> -->
-          <el-table-column show-overflow-tooltip label="上级库存被调拨占用量" align="center"  prop="superiorAllotQty" width="200px"/>
+          <!-- <el-table-column show-overflow-tooltip label="上级库存被调拨占用量" align="center"  prop="superiorAllotQty" width="200px"/> -->
           <!-- <el-table-column show-overflow-tooltip label="可用量" align="center"  prop="availableQty"/> -->
           <el-table-column show-overflow-tooltip label="调拨状态" align="center"  prop="statusAllot" width="100px">
             <template slot-scope="scope">

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

@@ -393,7 +393,7 @@ export const TabColumns = [
           isMedcine:'isMedicineValue',
           manufacturer:'manufacturerIdName',
           unit:'unitIdName',
-          tax:'materialRateName',
+          // tax:'materialRateName',
           storageCondition:'storageCondition',
           carriageCondition:'transportationCondition',
           materialClassifyOneName:'oneClass',
@@ -473,7 +473,7 @@ export const TabColumns = [
       { key: "arrivalQty", title: "已到货数量", inputType: "Input", },
       { key: "unarrivedQty", title: "未到货数量", inputType: "Input", },
       { key: "notaxMoney", title: "无税金额", inputType: "Input", },
-      { key: "priceSource", title: "价格目录ID", inputType: "Input", },
+      // { key: "priceSource", title: "价格目录ID", inputType: "Input", },
       { key: "isStorage", title: "入库关闭", inputType: "Checkbox", },
       { key: "isInvoice", title: "开票关闭", inputType: "Checkbox", },
       { key: "isArrival", title: "到货关闭", inputType: "Checkbox", },
@@ -609,7 +609,7 @@ export const TabColumns = [
           isMedcine:'isMedicineValue',
           manufacturer:'manufacturerIdName',
           unit:'unitIdName',
-          tax:'materialRateName',
+          // tax:'materialRateName',
           storageCondition:'storageCondition',
           carriageCondition:'transportationCondition',
           materialClassifyOneName:'oneClass',