Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

src/views/Business/Ditopn/Ccvpan.vue

@@ -112,7 +112,10 @@
       <el-form-item label="保证金实收比例" prop="liaall.liaccv.relcshpct">
         <c-row>
           <c-col :span="8">
-            <c-input :readonly="true" v-model="model.liaall.liaccv.relcshpct"></c-input>
+            <c-input
+              :readonly="true"
+              v-model="model.liaall.liaccv.relcshpct"
+            ></c-input>
           </c-col>
           <c-col :span="12" style="margin-left: 20px">
             <span>%</span>
@@ -183,53 +186,68 @@
        -->
     <c-col :span="24" style="text-align: right">
       <c-row>
-        <c-col :span="2" :offset="19">
-          <c-button
-            size="small"
-            type="primary"
-            @click="onLiaccvAdd"
-          >
+        <c-col :span="2" :offset="20">
+          <c-button size="small" type="primary" @click="onLiaccvAdd">
             Add
           </c-button>
-          <el-dialog :visible.sync="dialogTableVisible" :close-on-click-modal="false" :close-on-press-escape="false">
-            <c-istream-table
-              :list="stmData.data"
-              :columns="stmData.columns"
-            >
-            <el-table-column
-              prop="op"
-              label="OP"
-              width="100">
-            <template slot-scope="scope">
-              <a href="javascript:void(0)" @click="pickDepItem(scope.row)">选择</a>
-            </template>
-            </el-table-column>
+          <el-dialog
+            :visible.sync="dialogTableVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+          >
+            <c-istream-table :list="stmData.data" :columns="stmData.columns">
+              <el-table-column prop="op" label="OP" width="100">
+                <template slot-scope="scope">
+                  <a href="javascript:void(0)" @click="pickDepItem(scope.row)"
+                    >选择</a
+                  >
+                </template>
+              </el-table-column>
             </c-istream-table>
           </el-dialog>
         </c-col>
 
-        <c-col :span="2">
+        <!-- <c-col :span="2">
           <c-button size="small" icon="el-icon-delete" @click="onLiaccvDel">
             Del
           </c-button>
-        </c-col>
+        </c-col> -->
       </c-row>
     </c-col>
 
-    <c-col :span="24"><div style="height:10px"></div></c-col>
+    <c-col :span="24"><div style="height: 10px"></div></c-col>
 
     <c-col :span="22" :offset="1">
-      <c-table :border="true" :list="model.liaall.liaccv.liaccvg" style="width:80%,text-align:center">
-        <el-table-column prop="ccdflg" label="CF000048" width="auto"> </el-table-column>
-        <el-table-column prop="ownref" label="保证金编号" width="auto"> </el-table-column>
-        <el-table-column prop="cur" label="币种" width="auto"> </el-table-column>
-        <el-table-column prop="oldamt" label="余额" width="auto"> </el-table-column>
-        <el-table-column prop="amt" label="变动金额" width="auto"> </el-table-column>
-        <el-table-column prop="acc" label="保证金账号" width="auto"> </el-table-column>
-        <el-table-column prop="rat" label="汇率" width="auto"> </el-table-column>
-        <el-table-column prop="concur" label="币种" width="auto"> </el-table-column>
-        <el-table-column prop="covamt" label="折算后金额" width="auto"> </el-table-column>
-        <el-table-column prop="acccovamt" label="Acc Amount" width="auto"> </el-table-column>
+      <c-table
+        :border="true"
+        :list="model.liaall.liaccv.liaccvg"
+        style="width:80%,text-align:center"
+      >
+        <el-table-column prop="ccdflg" label="CF000048" width="auto">
+        </el-table-column>
+        <el-table-column prop="ownref" label="保证金编号" width="auto">
+        </el-table-column>
+        <el-table-column prop="cur" label="币种" width="auto">
+        </el-table-column>
+        <el-table-column prop="oldamt" label="余额" width="auto">
+        </el-table-column>
+        <el-table-column prop="amt" label="变动金额" width="auto">
+        </el-table-column>
+        <el-table-column prop="acc" label="保证金账号" width="auto">
+        </el-table-column>
+        <el-table-column prop="rat" label="汇率" width="auto">
+        </el-table-column>
+        <el-table-column prop="concur" label="币种" width="auto">
+        </el-table-column>
+        <el-table-column prop="covamt" label="折算后金额" width="auto">
+        </el-table-column>
+        <el-table-column prop="acccovamt" label="Acc Amount" width="auto">
+        </el-table-column>
+        <el-table-column label="OP" width="auto">
+          <template slot-scope="">
+            <a href="javascript:void(0)" @click="onLiaccvDel()">删除</a>
+          </template>
+        </el-table-column>
       </c-table>
     </c-col>
 
@@ -262,22 +280,30 @@
       </el-form-item>
     </c-col> -->
 
-  
-       <c-col :span="24">
-        <el-form-item label="金额总和">
-            <c-col :span="8">
-            <c-input style="width:50%"  v-model="model.liaall.liaccv.totcovamt"  placeholder="请输入金额总和"></c-input>
-            </c-col>
-        </el-form-item>
-       </c-col>       
-         
-                                   
-       <c-col :span="12">
-        <el-form-item label="Additional Information ">
-            <c-input type="textarea" :rows="5" v-model="model.liaall.liaccv.addinf" maxlength="200" show-word-limit placeholder="请输入Additional Information " ></c-input>
-        </el-form-item>
+    <c-col :span="24">
+      <el-form-item label="金额总和">
+        <c-col :span="8">
+          <c-input
+            style="width: 50%"
+            v-model="model.liaall.liaccv.totcovamt"
+            placeholder="请输入金额总和"
+          ></c-input>
         </c-col>
-        
+      </el-form-item>
+    </c-col>
+
+    <c-col :span="12">
+      <el-form-item label="Additional Information ">
+        <c-input
+          type="textarea"
+          :rows="5"
+          v-model="model.liaall.liaccv.addinf"
+          maxlength="200"
+          show-word-limit
+          placeholder="请输入Additional Information "
+        ></c-input>
+      </el-form-item>
+    </c-col>
   </div>
 </template>
 <script>
@@ -287,7 +313,7 @@ import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Ditopn/Event";
 
 export default {
-  inject: ['root'],
+  inject: ["root"],
   props: ["model", "codes"],
   mixins: [CommonProcess],
   data() {