调整入账管理、采购退库申请

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@@ -50,7 +50,7 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb"><span>常用配置</span></el-col>
-            <el-col :span="21">
+            <el-col :span="21" class="tlineheightb">
               <el-form-item>{{ formobj.configName }}</el-form-item>
             </el-col>
           </el-row>
@@ -85,50 +85,50 @@
           </div>
           <el-row>
             <el-col :span="3" class="tleftb"><span>政策1</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3">
               <el-form-item><el-input v-model="formobj.policyOne" placeholder="" clearable class="addinputw"/></el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb"><span>可享受金额</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3">
               <el-form-item><el-input @input="inputEligibleAmountOne" @keyup.native="formobj.eligibleAmountOne = oninput(formobj.eligibleAmountOne,2)" v-model="formobj.eligibleAmountOne" placeholder="" clearable class="addinputw"/></el-form-item>
             </el-col>
-            <el-col :span="8" class="tcenterb"><span>计算政策2时:<el-checkbox @change="changePolicyOne" style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox @change="changePolicyTwo" style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox @change="changePolicyThree" v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
+            <el-col :span="12" class="tcenterb"><span>计算政策2时:<el-checkbox @change="changePolicyOne" style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox @change="changePolicyTwo" style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox @change="changePolicyThree" v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb"><span>政策2</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3">
               <el-form-item><el-input v-model="formobj.policyTwo" placeholder="" clearable class="addinputw"/></el-form-item>
             </el-col>
-            <el-col :span="3" class="tleftb"><span>可享受比例（%）</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3" class="tleftb"><span>可享受比例(%)</span></el-col>
+            <el-col :span="3">
               <el-form-item><el-input @input="inputEligibleProportionTwo" v-model="formobj.eligibleProportionTwo" @keyup.native="formobj.eligibleProportionTwo = UpNumberRatio(formobj.eligibleProportionTwo,2)"  placeholder="" clearable class="addinputw"/></el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
-            <el-col :span="5">
+            <el-col :span="9">
               <el-form-item>{{ formobj.corrMoneyTwo }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb"><span>政策3</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3">
               <el-form-item><el-input v-model="formobj.policyThree" placeholder="" clearable class="addinputw"/></el-form-item>
             </el-col>
-            <el-col :span="3" class="tleftb"><span>可享受比例（%）</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3" class="tleftb"><span>可享受比例(%)</span></el-col>
+            <el-col :span="3">
               <el-form-item><el-input @input="inputEligibleProportionThree" v-model="formobj.eligibleProportionThree" @keyup.native="formobj.eligibleProportionThree = UpNumberRatio(formobj.eligibleProportionThree,2)" placeholder="" clearable class="addinputw"/></el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
-            <el-col :span="5">
+            <el-col :span="9">
               <el-form-item>{{ formobj.corrMoneyThree }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb"><span>金额合计</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3">
               <el-form-item><el-input v-model="formobj.moneyCount" @keyup.native="formobj.moneyCount = UpNumberRatio(formobj.moneyCount,2)" placeholder="" clearable class="addinputw"/></el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb"><span>政策备注</span></el-col>
-            <el-col :span="13">
+            <el-col :span="15">
               <el-form-item><el-input v-model="formobj.policyRemarks" placeholder="" clearable class="addinputw"/></el-form-item>
             </el-col>
           </el-row>
@@ -367,6 +367,9 @@ export default {
       } else {
         this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
       }
+      if (this.formobj.eligibleProportionThree !== '') {
+        this.inputEligibleProportionThree()
+      }
       return this.formobj.corrMoneyTwo
     },
     inputEligibleProportionThree() {
@@ -649,7 +652,13 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
-.freight {
-  color: #FFFFFF;
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item__content {
+  line-height: 15px !important;
 }
 </style>

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue

@@ -48,7 +48,7 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb"><span>常用配置</span></el-col>
-            <el-col :span="21">
+            <el-col :span="21" class="tlineheightb">
               <el-form-item>{{ formobj.configName }}</el-form-item>
             </el-col>
           </el-row>
@@ -83,50 +83,50 @@
           </div>
           <el-row>
             <el-col :span="3" class="tleftb"><span>政策1</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3">
               <el-form-item>{{ formobj.policyOne }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb"><span>可享受金额</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3">
               <el-form-item>{{ formobj.eligibleAmountOne }}</el-form-item>
             </el-col>
-            <el-col :span="8" class="tcenterb"><span>计算政策2时:<el-checkbox style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
+            <el-col :span="12" class="tcenterb"><span>计算政策2时:<el-checkbox style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb"><span>政策2</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3">
               <el-form-item>{{ formobj.policyTwo }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb"><span>可享受比例（%）</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3">
               <el-form-item>{{ formobj.eligibleProportionTwo }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
-            <el-col :span="5">
+            <el-col :span="9">
               <el-form-item>{{ formobj.corrMoneyTwo }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb"><span>政策3</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3">
               <el-form-item>{{ formobj.policyThree }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb"><span>可享受比例（%）</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3">
               <el-form-item>{{ formobj.eligibleProportionThree }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
-            <el-col :span="5">
+            <el-col :span="9">
               <el-form-item>{{ formobj.corrMoneyThree }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb"><span>金额合计</span></el-col>
-            <el-col :span="5">
+            <el-col :span="3">
               <el-form-item>{{ formobj.moneyCount }}</el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb"><span>政策备注</span></el-col>
-            <el-col :span="13">
+            <el-col :span="15">
               <el-form-item>{{ formobj.policyRemarks }}</el-form-item>
             </el-col>
           </el-row>
@@ -319,7 +319,13 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
-.freight {
-  color: #FFFFFF;
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item__content {
+  line-height: 15px !important;
 }
 </style>

anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue

@@ -36,10 +36,10 @@
           </el-row>
           <el-row class="rowStyle">
             <el-col :span="4" class="tleftb colStyle">
-              <span>退库原因:</span>
+              <span><span style="padding-right: 2px;color: red">*</span>退库原因:</span>
             </el-col>
             <el-col :span="20" class="colStyle">
-              <el-form-item>
+              <el-form-item prop="reason">
                 <el-input v-model="formobj.reason" style="width: 200%" placeholder="请输入退库原因" clearable/>
               </el-form-item>
             </el-col>
@@ -134,7 +134,9 @@ export default {
         taskId: '',
         detailsList: []
       },
-      rules: {},
+      rules: {
+        reason: [{ required: true, message: '请填写退库原因', trigger: 'blur' }]
+      },
       submitdisabled: false // 保存按钮
     }
   },
@@ -223,6 +225,7 @@ export default {
       this.init()
       this.formobj.name = window.sessionStorage.getItem('name')
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.money = 0
       req.detailsInfo(this.formobj.sid).then(resp => {
         const data = resp.data
         this.formobj.createTime = data.createTime
@@ -254,7 +257,9 @@ export default {
       })
     },
     saveAdd() {
-      const _this = this
+      if (this.formobj.money === '') {
+        this.formobj.money = 0
+      }
       this.$refs['form_obj'].validate(valid => {
         if (valid) {
           this.submitdisabled = true
@@ -263,7 +268,7 @@ export default {
             this.submitdisabled = false
             if (resp.success) {
               if (resp.success) {
-                _this.handleReturn('true')
+                this.handleReturn('true')
               }
             }
           }).catch(() => {
@@ -275,6 +280,9 @@ export default {
       })
     },
     saveEdit() {
+      if (this.formobj.money === '') {
+        this.formobj.money = 0
+      }
       this.$refs['form_obj'].validate(valid => {
         if (valid) {
           this.submitdisabled = true
@@ -293,6 +301,9 @@ export default {
       })
     },
     handleSubmit() {
+      if (this.formobj.money === '') {
+        this.formobj.money = 0
+      }
       this.$refs['form_obj'].validate(valid => {
         if (valid) {
           this.submitdisabled = true

anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue

@@ -35,7 +35,7 @@
           </el-row>
           <el-row class="rowStyle">
             <el-col :span="4" class="tleftb colStyle">
-              <span>退库原因:</span>
+              <span><span style="padding-right: 2px;color: red">*</span>退库原因:</span>
             </el-col>
             <el-col :span="20" class="colStyle">
               <el-form-item>
@@ -132,7 +132,9 @@ export default {
         money: '',
         detailsList: []
       },
-      rules: {},
+      rules: {
+        reason: [{ required: true, message: '请填写退库原因', trigger: 'blur' }]
+      },
       submitdisabled: false, // 保存按钮
     }
   },

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue

@@ -50,7 +50,7 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb"><span>常用配置</span></el-col>
-            <el-col :span="21">
+            <el-col :span="21" class="tlineheightb">
               <el-form-item>{{ formobj.configName }}</el-form-item>
             </el-col>
           </el-row>
@@ -510,8 +510,14 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
-.freight {
-  color: #FFFFFF;
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item__content {
+  line-height: 15px !important;
 }
 .rowClass{
   border-top: 1px solid #E0E3EB;

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@@ -49,7 +49,7 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb"><span>常用配置</span></el-col>
-            <el-col :span="21">
+            <el-col :span="21" class="tlineheightb">
               <el-form-item>{{ formobj.configName }}</el-form-item>
             </el-col>
           </el-row>
@@ -383,6 +383,9 @@ export default {
       } else {
         this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
       }
+      if (this.formobj.eligibleProportionThree !== '') {
+        this.inputEligibleProportionThree()
+      }
       return this.formobj.corrMoneyTwo
     },
     inputEligibleProportionThree() {
@@ -668,7 +671,13 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
-.freight {
-  color: #FFFFFF;
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item__content {
+  line-height: 15px !important;
 }
 </style>

anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue

@@ -48,7 +48,7 @@
           </el-row>
           <el-row>
             <el-col :span="3" class="tleftb"><span>常用配置</span></el-col>
-            <el-col :span="21">
+            <el-col :span="21" class="tlineheightb">
               <el-form-item>{{ formobj.configName }}</el-form-item>
             </el-col>
           </el-row>
@@ -388,7 +388,13 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
-.freight {
-  color: #FFFFFF;
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item__content {
+  line-height: 15px !important;
 }
 </style>