Merge branch 'dev' into 'purchaseDev'

xzt-391

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

src/views/purchase/DemandSummary/add.vue

@@ -47,7 +47,7 @@
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.isUrgency"
-              :disabled="lineDisable"
+              :disabled="scope.row.status !== '1' || lineDisable"
               active-value="Y"
               inactive-value="N"
               active-color="#13ce66"
@@ -59,7 +59,7 @@
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.isReplenishment"
-              :disabled="lineDisable"
+              :disabled="scope.row.status !== '1' || lineDisable"
               active-value="Y"
               inactive-value="N"
               active-color="#13ce66"
@@ -75,8 +75,8 @@
         <el-table-column show-overflow-tooltip label="收货仓库" align="center" prop="deliveryWarehouseName" width="150"/>
         <el-table-column show-overflow-tooltip label="收货货位" align="center" prop="deliveryAllocationName" width="200">
           <template slot-scope="scope">
-            <el-input clearable :disabled="lineDisable" size="small" v-model="scope.row.deliveryAllocationName" @clear="clean(scope.row)" @focus="chooseMxHW(scope.$index, 'ALLOCATION_PARAM', true, '收货货位', scope.row.deliveryWarehouse)">
-              <el-button size="small" :disabled="lineDisable" slot="append" icon="el-icon-more" @click="chooseMxHW(scope.$index, 'ALLOCATION_PARAM', true, '收货货位', scope.row.deliveryWarehouse)"></el-button>
+            <el-input clearable :disabled="scope.row.status !== '1' || lineDisable" size="small" v-model="scope.row.deliveryAllocationName" @clear="clean(scope.row)" @focus="chooseMxHW(scope.$index, 'ALLOCATION_PARAM', true, '收货货位', scope.row.deliveryWarehouse)">
+              <el-button size="small" :disabled="scope.row.status !== '1' || lineDisable" slot="append" icon="el-icon-more" @click="chooseMxHW(scope.$index, 'ALLOCATION_PARAM', true, '收货货位', scope.row.deliveryWarehouse)"></el-button>
             </el-input>
           </template>
         </el-table-column>
@@ -97,7 +97,7 @@
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.isBatchLock"
-              :disabled="lineDisable"
+              :disabled="scope.row.status !== '1' || lineDisable"
               active-value="Y"
               inactive-value="N"
               active-color="#13ce66"