Merge branch 'development-202206' into 'development-202206'

Development 202206

See merge request fukai/vue-gjjs!15

src/config/CodeTable/index.js

@@ -132,6 +132,15 @@ const CodeTable = {
         { label: "样品发票", value: "3" },
         { label: "海关发票", value: "4" },
     ],
+
+    ptytype: [
+        { label: "海关", value: "H" },
+        { label: "Other", value: "O" },
+        { label: "Own Address", value: "A" },
+        { label: "Bank", value: "B" },
+        { label: "Client", value: "C" },
+    ],
+    
     trpdoctyp: [
         { label: "海运提单", value: "Ocean Bill of Lading" },
         { label: "其它运输单据", value: "Other Transport Document" },

src/views/Statics/Dbiact/ActInfo.vue

@@ -29,7 +29,7 @@
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号币种" prop="cur">
-          <c-select v-model="model.cur" placeholder="请选择账号币种" :code="getCodesByKey('curtxt')"> </c-select>
+          <c-select v-model="model.cur" style="width: 100%" placeholder="请选择账号币种" :code="getCodesByKey('curtxt')"> </c-select>
         </el-form-item>
       </c-col>
       <c-col :span="24">
@@ -49,7 +49,7 @@
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号提供机构种类" prop="serptytyp">
-          <c-select v-model="model.serptytyp" placeholder="请选择账号提供机构种类" :code="getCodesByKey('ptytyp')">
+          <c-select v-model="model.serptytyp" style="width: 100%" placeholder="请选择账号提供机构种类" :code="getCodesByKey('ptytyp')">
           </c-select>
         </el-form-item>
       </c-col>
@@ -71,7 +71,7 @@
       </c-col>
       <c-col :span="24">
         <el-form-item label="账号开户机构类型" prop="holptytyp">
-          <c-select v-model="model.holptytyp" placeholder="请选择账号开户机构类型" :code="getCodesByKey('ptytyp')">
+          <c-select v-model="model.holptytyp" style="width: 100%" placeholder="请选择账号开户机构类型" :code="getCodesByKey('ptytyp')">
           </c-select>
         </el-form-item>
       </c-col>
@@ -101,7 +101,7 @@
     <c-col :span="12" class="col-right">
       <c-col :span="24">
         <el-form-item label="借贷标志" prop="dirflg">
-          <c-select v-model="model.dirflg" placeholder="请输入借贷标志" >
+          <c-select v-model="model.dirflg" style="width: 100%" placeholder="请输入借贷标志" >
             <el-option
               v-for="item in dirflg"
               :key="item.value"
@@ -176,7 +176,7 @@
       </c-col>
       <c-col :span="24">
         <el-form-item label="账户类型" prop="acctyp">
-          <c-select v-model="model.acctyp" placeholder="请选择账户类型" > 
+          <c-select v-model="model.acctyp" style="width: 100%" placeholder="请选择账户类型" > 
             <el-option
               v-for="item in acctyp"
               :key="item.value"

src/views/Statics/Dbifec/FecInfo.vue

@@ -31,7 +31,7 @@
         </c-col>
       <c-col :span="24">
             <el-form-item label="起始日期" prop="begdat">
-                <c-date-picker
+                <c-date-picker style="width: 100%"
                     v-model="model.begdat"
                     placeholder="请输入起始日期"
                 >
@@ -40,7 +40,7 @@
         </c-col>
       <c-col :span="24">
             <el-form-item label="终止日期" prop="enddat">
-                <c-date-picker
+                <c-date-picker style="width: 100%"
                     v-model="model.enddat"
                     placeholder="请输入终止日期"
                 >
@@ -85,11 +85,7 @@
         </c-col>
       <c-col :span="24">
             <el-form-item label="最大金额的币种" prop="maxcur">
-                <c-input
-                    v-model="model.maxcur"
-                    placeholder="请输入最大金额的币种"
-                >
-                </c-input>
+                <c-select v-model="model.maxcur" style="width: 100%" placeholder="请选择最大金额的币种" :code="getCodesByKey('bopcur')"> </c-select>
             </el-form-item>
         </c-col>
       <c-col :span="24">
@@ -112,11 +108,7 @@
         </c-col>
       <c-col :span="24">
             <el-form-item label="最小金额的币种" prop="mincur">
-                <c-input
-                    v-model="model.mincur"
-                    placeholder="请输入最小金额的币种"
-                >
-                </c-input>
+                <c-select v-model="model.mincur" style="width: 100%" placeholder="请选择最小金额的币种" :code="getCodesByKey('bopcur')"> </c-select>
             </el-form-item>
         </c-col>
       <c-col :span="24">
@@ -175,11 +167,7 @@
         </c-col>
       <c-col :span="24">
             <el-form-item label="费率币种" prop="ratcur">
-                <c-input
-                    v-model="model.ratcur"
-                    placeholder="请输入费率币种"
-                >
-                </c-input>
+                <c-select v-model="model.ratcur" style="width: 100%" placeholder="请选择费率币种" :code="getCodesByKey('bopcur')"> </c-select>
             </el-form-item>
         </c-col>
       <c-col :span="24">

src/views/Statics/Dbifec/FeeInfo.vue

@@ -122,7 +122,7 @@
       </c-col>
     <c-col :span="24">
           <el-form-item label="有效期起始日" prop="begdatFee">
-              <c-date-picker
+              <c-date-picker style="width: 100%"
                   v-model="model.begdatFee"
                   placeholder="请输入有效期起始日"
               >
@@ -131,7 +131,7 @@
       </c-col>
     <c-col :span="24">
           <el-form-item label="有效期终止日" prop="enddatFee">
-              <c-date-picker
+              <c-date-picker style="width: 100%"
                   v-model="model.enddatFee"
                   placeholder="请输入有效期终止日"
               >

src/views/Statics/Dbipty/AdrInfo.vue

@@ -177,7 +177,7 @@
       <c-col :span="8" class="col-right">
         <c-col :span="24">
           <el-form-item label="默认语种" prop="uil">
-            <c-select v-model="adr.uil" placeholder="请选择默认语种" :code="getCodesByKey('gtxuil')"> </c-select>
+            <c-select v-model="adr.uil" style="width: 100%" placeholder="请选择默认语种" :code="getCodesByKey('gtxuil')"> </c-select>
           </el-form-item>
         </c-col>
         <c-col :span="24">

src/views/Statics/Dbipty/PtyInfo.vue

@@ -13,7 +13,7 @@
       </c-col>
       <c-col :span="24">
         <el-form-item label="客户类型" prop="ptytyp">
-          <c-input v-model="model.ptytyp" placeholder="请输入客户类型"> </c-input>
+          <c-select v-model="model.ptytyp" style="width: 100%" placeholder="请选择客户类型" :code="getCodesByKey('ptytype')"> </c-select>
         </el-form-item>
       </c-col>
       <c-col :span="24">
@@ -153,7 +153,7 @@
     <c-col :span="12" class="col-right">
     <c-col :span="24">
         <el-form-item label="默认语种" prop="uil">
-          <c-select v-model="model.uil" placeholder="请选择默认语种" :code="getCodesByKey('gtxuil')"> </c-select>
+          <c-select v-model="model.uil" style="width: 100%" placeholder="请选择默认语种" :code="getCodesByKey('gtxuil')"> </c-select>
         </el-form-item>
       </c-col>
       <c-col :span="24">
@@ -208,8 +208,8 @@
         </el-form-item>
       </c-col>
       <c-col :span="24">
-        <el-form-item label="客户类型" prop="idtype">
-          <c-input v-model="model.idtype" placeholder="请输入客户类型"> </c-input>
+        <el-form-item label="客户类别" prop="idtype">
+          <c-select v-model="model.idtype" style="width: 100%" placeholder="请选择客户类别" :code="getCodesByKey('persontype')"> </c-select>
         </el-form-item>
       </c-col>
       <c-col :span="24">
@@ -230,7 +230,13 @@
       </c-col>
       <c-col :span="24">
         <el-form-item label="交易主体" prop="trnman">
-          <c-input v-model="model.trnman" placeholder="请输入交易主体"> </c-input>
+          <c-select
+            v-model="model.trnman"
+            style="width: 100%"
+            placeholder="请选择交易主体"
+            :code="getCodesByKey('jyzt')"
+          >
+          </c-select>
         </el-form-item>
       </c-col>
       <c-col :span="24">

src/views/Statics/Dbiusr/UsrInfo.vue

@@ -31,6 +31,7 @@
       <c-col :span="24">
         <el-form-item label="最近登录时间" prop="ssnbegdattim">
           <c-date-picker
+              style="width: 100%"
               v-model="model.ssnbegdattim"
               placeholder="请选择最近登录时间"
           >
@@ -76,6 +77,7 @@
       <c-col :span="24">
         <el-form-item label="最近DIA查看时间" prop="lstdiadat">
           <c-date-picker
+              style="width: 100%"
               v-model="model.lstdiadat"
               placeholder="请选择最近DIA查看时间"
           >
@@ -84,7 +86,7 @@
       </c-col>
       <c-col :span="24">
         <el-form-item label="授权币种" prop="relcur">
-          <c-select v-model="model.relcur" placeholder="请选择账号币种" :code="getCodesByKey('curtxt')"> </c-select>
+          <c-select v-model="model.relcur" style="width: 100%" placeholder="请选择账号币种" :code="getCodesByKey('curtxt')"> </c-select>
         </el-form-item>
       </c-col>
       <c-col :span="24">