Merge remote-tracking branch 'origin/dev' into dev

src/views/iosBasicData/ComputationCenter/index.vue

@@ -32,10 +32,10 @@
                     </el-button>
                     <span style="font-size: 24px;font-weight: 600;">
                         <span style="color: #67C23A;margin-right: 10px;">
-                            CNY:￥{{ amountSubSum }}元
+                            CNY:￥{{ amountSubSum.toFixed(2) }}元
                         </span>
                         <span style="color: #E6A23C;">
-                            USD:${{ amountSubUsdSum }}元
+                            USD:${{ amountSubUsdSum.toFixed(2) }}元
                         </span>
                     </span>
                 </template>

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -433,7 +433,7 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="16">
                 <el-form-item label="关贸云编码" prop="gmyCode">
                   <el-input v-model="formData.gmyCode" size="small" placeholder="请输入关贸云编码" clearable
                     :style="{ width: '100%' }">

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -439,12 +439,14 @@ export default {
                             required: true,
                             // message: "请输入单价",
                             trigger: "blur"
-                        }, {
-                            // pattern:/[1-9]\d*.\d*|0\.\d*[1-9]\d*/,
-                            pattern: /-?[1-9]\d*/,
-                            // message:"请输入数字",
-                            trigger: 'blur'
-                        }]
+                        }, 
+                        // {
+                        //     // pattern:/[1-9]\d*.\d*|0\.\d*[1-9]\d*/,
+                        //     pattern: /-?[1-9]\d*/,
+                        //     // message:"请输入数字",
+                        //     trigger: 'blur'
+                        // }
+                    ]
                     },
                     {
                         label: "计量单位",

src/views/iosBasicData/psBcorps/detailsPage.vue

@@ -413,7 +413,7 @@
                           </el-input>
                       </el-form-item>
                   </el-col>
-                  <el-col :span="8">
+                  <el-col :span="16">
                       <el-form-item label="关贸云编码" prop="gmyCode">
                           <el-input v-model="formData.gmyCode" size="small" placeholder="请输入关贸云编码" clearable :style="{ width: '100%' }">
                           </el-input>

src/views/serviceConfiguration/configurationModification/detailsPage.vue

@@ -276,6 +276,9 @@ export default {
                         }, {
                             label: '业务来源',
                             value: '业务来源'
+                        }, {
+                            label: 'OP',
+                            value: 'OP'
                         }],
                     },
                     {