Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/config/CodeTable/index.js

@@ -6655,7 +6655,7 @@ const CodeTable = {
         { label: "SCC 贷记其他保证金账", value: "SCC" },
         { label: "BF 国结系统融资过渡账", value: "BF" }
     ],
-    setgll_dsp: [
+    setgll_dsp2: [
         { label: "LOD 借记客户往来账", value: "LOD" },
         { label: "TPD 借记国际结算临时账", value: "TPD" },
         { label: "SPD 借记国结专户", value: "SPD" },

src/views/Public/Setpan.vue

@@ -508,9 +508,22 @@
             ></c-input-currency> -->
             </template>
         </el-table-column>
-        <el-table-column label="处理方式" width="110px">
+        <el-table-column label="处理方式" width="110px" prop="dsp">
           <template #default="scope">
-            <c-select v-model="scope.row.dsp" @change="dspChange(scope.$index)">
+            <c-select v-model="scope.row.dsp" @change="dspChange(scope.$index)" v-if="scope.row.debcdtflg=='D'">
+              <el-option
+                v-for="item in codes.setgll_dsp2"
+                :key="item.value"
+                :label="item.value"
+                :value="item.value"
+              >
+                <span style="float: left">{{ item.value }}</span>
+                <span style="float: left; margin-left: 20px">{{
+                  item.label
+                }}</span>
+              </el-option>
+            </c-select>
+            <c-select v-model="scope.row.dsp" @change="dspChange(scope.$index)" v-if="scope.row.debcdtflg=='C'">
               <el-option
                 v-for="item in codes.setgll_dsp1"
                 :key="item.value"
@@ -544,6 +557,7 @@
           </template>
         </el-table-column>
         <el-table-column label="借/贷" prop="debcdtflg" width="70px">
+
         </el-table-column>
         <el-table-column label="原始币种" prop="cur" width="70px">
         </el-table-column>