Merge branch 'purchaseDev' into 'dev'

Purchase dev

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

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

@@ -123,6 +123,7 @@ const PurColumns =[
      isShow:true,
     queryParams: (params) => ({
       stordocId: params.warehouse,
+      pkOrg: params.puOrg,
     }),
     width: 200,
   },
@@ -958,6 +959,7 @@ const CauseColumns =[
      isShow:true,
     queryParams: (params) => ({
       stordocId: params.warehouse,
+      pkOrg: params.puOrg,
     }),
     width: 200,
   },

src/views/purchase/purchase-order/add/index.vue

@@ -829,6 +829,7 @@ export default {
       size="mini"
       label-position="right"
       ref="orderAddForm"
+      class="orderAddForm"
       label-width="140px"
       :model="params"
       :rules="rules"
@@ -1167,9 +1168,13 @@ export default {
 </template>
 
 <style scoped>
+  .orderAddForm>>>.el-form-item{
+    margin-bottom: 12px;
+  }
 ::v-deep .singleTable .el-form-item{
   margin-bottom: 0px;
 }
+
 </style>
 
 

src/views/purchase/purchase-order/edit/index.vue

@@ -642,7 +642,8 @@ export default {
 
       if(key === 'qty'){
 
-        return this.handleIsRevise() ? row['originalQty'] :
+        return this.handleIsRevise() ? 
+          (Math.sign(row['originalQty']) == -1 ? 0 : row['originalQty'] ) :
           (this.params.source == '3' ? Infinity: row['originalQty'])
       
       }
@@ -798,6 +799,7 @@ export default {
       v-loading="loading" 
       :size="size" 
       ref="orderEditForm" 
+      class="orderEditForm"
       label-position="right" 
       label-width="140px"
       :model="params" 
@@ -1108,6 +1110,9 @@ export default {
 </template>
 
 <style scoped>
+  .orderEditForm>>>.el-form-item{
+    margin-bottom: 12px;
+  }
 ::v-deep .singleTable .el-form-item{
   margin-bottom: 0px;
 }

src/views/purchase/purchase-order/see/index.vue

@@ -216,7 +216,8 @@ export default {
       label-width="140px" 
       :model="params" 
       :rules="rules"
-      ref="orderSeeForm" 
+      ref="orderSeeForm"
+      class="orderSeeForm" 
     >
         
       <el-card :body-style="{
@@ -492,6 +493,9 @@ export default {
 </template>
 
 <style scoped>
+  .orderSeeForm>>>.el-form-item{
+    margin-bottom: 12px;
+  }
 ::v-deep .singleTable .el-form-item{
   margin-bottom: 0px;
 }