Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/views/Business/Sptsel/Menu.vue

@@ -79,7 +79,7 @@
               </el-form-item>
             </c-col>
             <c-col :span="8" v-show="searchSlot.searchToggle">
-              <el-form-item label="来源" style="width: 100%">
+              <el-form-item label="来源" style="width: 100%" prop="sourceModel">
                 <c-select
                   v-model="sourceModel"
                   style="width: 70%"
@@ -184,11 +184,15 @@
                 </el-form-item>
             </c-col>
 
-            <c-col :span="8" v-if="model.usfmod.flt==='<SELB>'">
+            <c-col :span="8" v-else-if="model.usfmod.flt==='<SELB>'">
                 <el-form-item label="归属机构" style="width:100%">
                     <c-input></c-input>
                 </el-form-item>
             </c-col>
+            <c-col :span="8" v-else>
+                <el-form-item label="" style="width:100%;height: 36.8px;margin:0 0 0 0">
+                </el-form-item>
+            </c-col>
 
               
               <!-- <c-col :span="12" style="text-align:center" >
@@ -273,7 +277,7 @@
       </c-col> -->
       <c-col :span="24">
         <c-istream-table :list="stmData.data" :columns="stmData.columns">
-          <el-table-column fixed="right" prop="op" label="OP" width="200px">
+          <el-table-column fixed="right" prop="op" label="OP" width="140px">
             <template>
               <c-button
                 style="margin-left: 0"
@@ -348,7 +352,7 @@ export default {
   mixins: [CommonProcess],
   data() {
     return {
-      sourceModel: "",
+      //sourceModel: [],
       sourceData: [
         { label: "Incoming", value: "chkinc" },
         { label: "E-Trade", value: "chkdzt" },
@@ -385,9 +389,9 @@ export default {
           // "21 8 \"Amt\" 69 2 8 1 16",
           // "1 9 \"Status\" 60 1 tdViewTypeEdit:0 1 SPT:STA",
           '8 10 "创建人" 80',
-          '15 11 "Work User" 90',
-          '17 12 "Work Branch" 126',
-          '16 13 "Last User" 76',
+          '15 11 "当前操作柜员" 100',
+          '17 12 "当前组别" 100',
+          '16 13 "上次操作柜员" 100',
           '1 14 "来源" 50', //新加列，值暂设为第一个
           '3 15 "提示" 50 1 20:0 1 FormatINFDSP',
           // "19 15 \"Key\" 90",
@@ -462,7 +466,30 @@ export default {
         this.model.chkcan = val ? "t" : "";
       },
     },
+    sourceModel:{
+      get(){
+        let arr = [];
+        this.sourceData.forEach(element => {
+          if(this.model[element.value]){
+            arr.push(element.value);
+          }
+        });
+        return arr;
+      },
+      set(val){
+        let set = new Set(val);
+        this.sourceData.forEach(element => {
+          if(set.has(element.value)){
+            this.model[element.value]="t";
+          }
+          else{
+            this.model[element.value]="";
+          }
+        });
+      }
+    }
   },
+
   methods: { ...Event },
   created: function () {},
 };

src/views/Public/Engp.vue

@@ -13,7 +13,7 @@
         <el-table-column prop="nam" label="Name" width="170px"> </el-table-column>
         <el-table-column prop="cdtrol" label="Cdt." width="70px"> </el-table-column>
         <el-table-column prop="cur" label="Cur" width="55px"> </el-table-column>
-        <el-table-column prop="oldamt" label="Old Amount" width="150px" fixed="right">
+        <el-table-column prop="oldamt" label="Old Amount" width="150px">
          <!-- <template slot-scope="scope">
                   {{moneyFormat(scope.row.oldamt)}}
          </template> -->
@@ -31,7 +31,7 @@
                   {{dateFormat(scope.row.valdat)}}
          </template> -->
         </el-table-column>
-        <el-table-column label="" prop="det" width="80px">
+        <el-table-column label="" prop="det" width="80px" fixed="right">
                     <template slot-scope="scope" slot="header">
                         <el-button
                             circle