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

src/views/Business/Sptsel/Menu.vue

@@ -59,7 +59,7 @@
                     </el-row> -->
           <el-row>
             <c-col :span="8">
-              <el-form-item label="Reference" prop="selobj" style="width: 100%">
+              <el-form-item label="业务编号" prop="selobj" style="width: 100%">
                 <c-input
                   style="width: 100%"
                   v-model="model.selobj"
@@ -70,7 +70,7 @@
             </c-col>
 
             <c-col :span="8">
-              <el-form-item label="Name" prop="seltxt" style="width: 100%">
+              <el-form-item label="业务描述" prop="seltxt" style="width: 100%">
                 <c-input
                   v-model="model.seltxt"
                   maxlength="32"
@@ -85,6 +85,7 @@
                   style="width: 70%"
                   placeholder="请选择来源"
                   multiple
+                  collapse-tags
                 >
                   <el-option
                     v-for="item in sourceData"
@@ -102,11 +103,11 @@
             <c-col :span="24">
               <c-col :span="8">
                 <el-form-item
-                  label="Selection of Users"
+                  label="业务所属组"
                   prop="usfmod.flt"
                   style="width: 100%"
                 >
-                  <c-col :span="20">
+                  <!-- <c-col :span="20"> -->
                     <c-select
                       v-model="model.usfmod.flt"
                       style="width: 100%"
@@ -120,8 +121,8 @@
                       >
                       </el-option>
                     </c-select>
-                  </c-col>
-                  <c-col :span="4" style="text-align: right">
+                  <!-- </c-col> -->
+                  <!-- <c-col :span="4" style="text-align: right">
                     <c-button
                       size="small"
                       type="primary"
@@ -130,12 +131,12 @@
                       @click="onUsfmodShwflt"
                     >
                     </c-button>
-                  </c-col>
+                  </c-col> -->
                 </el-form-item>
               </c-col>
 
               <c-col :span="8">
-                <el-form-item label="Between" style="width: 100%">
+                <el-form-item label="创建时间" style="width: 100%">
                   <c-col :span="11">
                     <el-date-picker
                       type="date"
@@ -157,18 +158,16 @@
                   </c-col>
                 </el-form-item>
               </c-col>
-            </c-col>
 
-            <c-col :span="24">
               <c-col :span="8">
                 <el-form-item
-                  label="国内国际证标志"
+                  label="业务标志"
                   prop="dflg"
                   style="width: 100%"
                 >
                   <c-select
                     v-model="model.dflg"
-                    style="width: 100%"
+                    style="width: 70%"
                     placeholder="请选择国内国际标志"
                   >
                     <el-option label="All" value="1"></el-option>
@@ -178,11 +177,25 @@
                 </el-form-item>
               </c-col>
 
+            </c-col>
+            <c-col :span="8" v-if="model.usfmod.flt==='<SELU>'">
+                <el-form-item label="创建人" style="width:100%">
+                    <c-input></c-input>
+                </el-form-item>
+            </c-col>
+
+            <c-col :span="8" v-if="model.usfmod.flt==='<SELB>'">
+                <el-form-item label="归属机构" style="width:100%">
+                    <c-input></c-input>
+                </el-form-item>
+            </c-col>
+
+              
               <!-- <c-col :span="12" style="text-align:center" >
                             <c-checkbox v-model="model.chkypt">云平台</c-checkbox>
                         </c-col> -->
 
-              <c-col :span="8">
+              <!-- <c-col :span="8">
                 <el-form-item
                   label="退回原因"
                   prop="yptinf"
@@ -195,8 +208,7 @@
                     :readonly="true"
                   ></c-input>
                 </el-form-item>
-              </c-col>
-            </c-col>
+              </c-col> -->
           </el-row>
         </el-form>
       </template>
@@ -340,7 +352,7 @@ export default {
       sourceData: [
         { label: "Incoming", value: "chkinc" },
         { label: "E-Trade", value: "chkdzt" },
-        { label: "Break", value: "chkpen" },
+        // { label: "Break", value: "chkpen" },
         { label: "Correction", value: "chkcor" },
         { label: "Automatic", value: "chkaut" },
         { label: "Reject", value: "chkdel" },