Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/OP/EntryQuotation.vue

@@ -8,13 +8,32 @@
                 </div>
                 <div class="entryquotation-form-content">
                     <div class="entryquotation-content" v-for="(items,index) in item.infos" :key="index">
-                        <el-input type="textarea" v-model="items.feeName"></el-input>
-                        <el-input-number :precision="2" :controls="false" v-model="items.unitPrice"></el-input-number>
-                        <el-input-number :precision="2" :controls="false" v-model="items.quantity"></el-input-number>
-                        <el-input-number :precision="2" :controls="false" v-model="items.totalAmt"></el-input-number>
+                        <div class="entryquotation-content-box">
+                            <label>描述:</label>
+                            <el-input style="width:340px" autosize type="textarea" v-model="items.feeName"></el-input>
+                        </div>
+                        <div class="entryquotation-content-box">
+                            <label>单价:</label>
+                            <el-input-number size="small" :precision="2" :controls="false" v-model="items.unitPrice"></el-input-number>
+                        </div>
+                        <div class="entryquotation-content-box">
+                            <label>数量:</label>
+                            <el-input-number size="small" :precision="2" :controls="false" v-model="items.quantity"></el-input-number>
+                        </div>
+                        <div class="entryquotation-content-box">
+                            <label>小计:</label>
+                            <el-input-number size="small" :precision="2" :controls="false" v-model="items.totalAmt"></el-input-number>
+                        </div>
+                        <el-button size="small" type="danger">移除</el-button>
                         <!-- {{ items.feeName }} -->
                     </div>
                 </div>
+                <div class="entryquotation-form-totalprice">
+                    <div class="entryquotation-content-box">
+                        <label>该项总计:</label>
+                        <el-input-number size="small" :precision="2" :controls="false" v-model="item.totalAmt"></el-input-number>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
@@ -85,15 +104,34 @@ export default {
     width: 20%;
     border-bottom: 1px solid #ebeef5;
     border-right: 1px solid #ebeef5;
+    display: flex;
+    align-items: center;
 }
 .entryquotation-form-content{
-    width: 60%;
+    width: 65%;
     border-bottom: 1px solid #ebeef5;
+    border-right: 1px solid #ebeef5;
+    padding: 10px;
 }
-.entryquotation-form-content{
+.entryquotation-form-totalprice{
+    width: 15%;
+    border-bottom: 1px solid #ebeef5;
     padding: 10px;
+    display: flex;
+    align-items: center;
 }
 .entryquotation-content{
+    display: flex;
+    align-items: center;
     margin: 5px 0;
 }
+.entryquotation-content-box{
+    display: flex;
+    align-items: center;
+    margin-right: 15px;
+    padding: 5px 0;
+}
+.entryquotation-content-box label{
+    margin-right: 5px;
+}
 </style>