Browse Source

Merge branch 'dev' of http://git.echepei.com/tire-platform/Smart_platform_ui into dev

Qukatie 1 month ago
parent
commit
3f0dd44766

+ 8 - 0
src/api/iosBasicData/accounts.js

@@ -74,3 +74,11 @@ export const accountsPost = () => {
   })
 }
 
+// 核算大类
+export const getItemClassifyList = (params) => {
+  return request({
+    url: '/api/blade-los/baccitemstype/list',
+    method: 'get',
+    params
+  })
+}

+ 7 - 0
src/api/iosBasicData/editypes.js

@@ -48,3 +48,10 @@ export const update = (row) => {
   })
 }
 
+export const verifyEdiCodes = () => {
+  return request({
+    url: '/api/blade-los/editypes/verifyEdiCodes',
+    method: 'get',
+  })
+}
+

+ 1 - 1
src/util/configration.js

@@ -2,6 +2,6 @@
  * 浏览器判断是否全屏
  */
 export const getDefaultExtendedDataNames = () => {
-    var a = "INTTRA,MAEU,OOCL,APL,PIL,HJ,HMM,ESL,ZIM,PO,MSC,CSAV,QQCT,CTM,SML,VOLTA".split(",");
+    var a = "INTTRA,MAEU,OOCL,APL,PIL,HJ,HMM,ESL,ZIM,PO,MSC,EP,QQCT,CTM,SML,VOLTA,CMA,ONE".split(",");
     return a.sort((a, b) => a.localeCompare(b));
 };

+ 2 - 2
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -1734,7 +1734,7 @@ export default {
     // KL,CUSTOMS,MOL
     // APL,ESL,HMM,INTTRA,ONE,PIL,SML,VOLTA,YANGMING,ZIM
     // let columnNames = 'INTTRA,MAEU,OOCL,APL,PIL,HJ,HMM,ESL,ZIM,PO,MSC,CSAV,QQCT,CTM,SML,VOLTA';
-    let columnNames = "APL,ESL,HMM,INTTRA,CSAV=ONE,PIL,HJ=SML,VOLTA,ZIM";
+    let columnNames = "APL,ESL,HMM,INTTRA,CMA,ONE,PIL,HJ=SML,VOLTA,ZIM,EP";
     columnNames.split(",").forEach(col => {
       if (col.indexOf("=") > 0) {
         let cols = col.split("=");
@@ -1746,7 +1746,7 @@ export default {
     this.portDorpdownColumns = portColumns;
 
     let vslColumns = [{ key: "enName", field: "enName", label: "名称", width: "200px" }];
-    columnNames = "APL,HMM,MSC,CSAV,SML";
+    columnNames = "APL,HMM,MSC,EP,SML";
     columnNames.split(",").forEach(col => {
       vslColumns.push({ key: col, field: col, label: col, fontSize: "10px", width: "45px" });
     });

+ 0 - 1
src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue

@@ -82,7 +82,6 @@
         methods:{
             // 点击打印
             handleCurrentRowChange(val){
-                console.log(val,1211111)
                 this.$emit('reportRadio',val)
             },
             searchChange(params, done) {

+ 2 - 1
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -2778,9 +2778,10 @@ export default {
               if (r.need_mail) {
                 var title = "请输入情况说明<br /><b>" + r.profitStatusCnText;
                 if (r.ProfitDescr) {
-                  title += "</b><br /><br />" + r.ProfitDescr.replaceAll("\n", "<br />");
+                  title += "</b><br />" + r.ProfitDescr.replaceAll("\n", "<br />");
                 }
                 this.$prompt(title, "情况说明", {
+                  dangerouslyUseHTMLString: true,
                   confirmButtonText: "确定",
                   cancelButtonText: "取消",
                   inputType: "textArea",

+ 369 - 200
src/views/iosBasicData/accounts/assembly/accountsDialog.vue

@@ -1,201 +1,348 @@
 <template>
-    <div>
-        <el-form :model="form" ref="form" label-width="70px" class="demo-ruleForm">
-            <el-row :gutter="20">
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="科目编码:" prop="code">
-                            <el-input style="width: 100%;" v-model="form.code"
-                                      size="small" autocomplete="off" @input="numinput"
-                                      clearable placeholder="请输入科目编码" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="科目名称:" prop="cnName">
-                            <el-input style="width: 100%;" v-model="form.cnName"
-                                      size="small" autocomplete="off"
-                                      clearable placeholder="请输入科目名称" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="方向:" prop="dc">
-                            <search-query :datalist="dcData"
-                                          :selectValue="form.dc"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :buttonIf="false"
-                                          placeholder="请选择方向"
-                                          @corpChange="corpChange($event,'dc')">
-                            </search-query>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="科目类别:" prop="property">
-                            <search-query :datalist="propertyData"
-                                          :selectValue="form.property"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :buttonIf="false"
-                                          placeholder="请选择科目类别"
-                                          :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"
-                                          @remoteMethod="propertyWorkDictsfun"
-                                          @corpChange="corpChange($event,'property')"
-                                          @corpFocus="propertyWorkDictsfun" >
-                            </search-query>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="上级科目:" prop="parentCode">
-                            <el-input style="width: 100%;" v-model="form.parentCode"
-                                      size="small" autocomplete="off" :disabled="true"
-                                      clearable placeholder="无上级科目" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="币种:" prop="curCode">
-                            <search-query :datalist="curData"
-                                          :selectValue="form.curCode"
-                                          :filterable="true"
-                                          :clearable="true"
-                                          :remote="true"
-                                          :buttonIf="false"
-                                          placeholder="请选择币种"
-                                          :forParameter="{key:'id',label:'code',value:'code'}"
-                                          @remoteMethod="getRateListfun"
-                                          @corpChange="corpChange($event,'curCode')"
-                                          @corpFocus="getRateListfun">
-                            </search-query>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-col :span="24">
-                    <el-form-item label="辅助核算:">
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isItem">项目</el-checkbox>
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isCorp">客户</el-checkbox>
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isDept">部门</el-checkbox>
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isEmpl">职员</el-checkbox>
-                        <!--<el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isStock">库存</el-checkbox>-->
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isManual" style="margin-left: 50px;">允许手工凭证使用</el-checkbox>
-                        <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isDc">应收/应付科目</el-checkbox>
-                      <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isArAp">预收/预付科目</el-checkbox>
-                    </el-form-item>
-                </el-col>
+  <div>
+    <el-form :model="form" ref="form" label-width="70px" class="demo-ruleForm">
+      <el-row :gutter="20">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="科目编码:" prop="code">
+              <el-input
+                style="width: 100%"
+                v-model="form.code"
+                size="small"
+                autocomplete="off"
+                @input="numinput"
+                clearable
+                placeholder="请输入科目编码"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="科目名称:" prop="cnName">
+              <el-input style="width: 100%" v-model="form.cnName" size="small" autocomplete="off" clearable placeholder="请输入科目名称"> </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="方向:" prop="dc">
+              <search-query
+                :datalist="dcData"
+                :selectValue="form.dc"
+                :filterable="true"
+                :clearable="true"
+                :remote="true"
+                :buttonIf="false"
+                placeholder="请选择方向"
+                @corpChange="corpChange($event, 'dc')"
+              >
+              </search-query>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="科目属性:" prop="property">
+              <search-query
+                :datalist="propertyData"
+                :selectValue="form.property"
+                :filterable="true"
+                :clearable="true"
+                :remote="true"
+                :buttonIf="false"
+                placeholder="请选择科目属性"
+                :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }"
+                @remoteMethod="propertyWorkDictsfun"
+                @corpChange="corpChange($event, 'property')"
+                @corpFocus="propertyWorkDictsfun"
+              >
+              </search-query>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="上级科目:" prop="parentCode">
+              <el-input
+                style="width: 100%"
+                v-model="form.parentCode"
+                size="small"
+                autocomplete="off"
+                :disabled="true"
+                clearable
+                placeholder="无上级科目"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="币种:" prop="curCode">
+              <search-query
+                :datalist="curData"
+                :selectValue="form.curCode"
+                :filterable="true"
+                :clearable="true"
+                :remote="true"
+                :buttonIf="false"
+                placeholder="请选择币种"
+                :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                @remoteMethod="getRateListfun"
+                @corpChange="corpChange($event, 'curCode')"
+                @corpFocus="getRateListfun"
+              >
+              </search-query>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-col :span="24">
+          <el-form-item label="辅助核算:">
+            <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isItem">项目</el-checkbox>
+            <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isCorp">客户</el-checkbox>
+            <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isDept">部门</el-checkbox>
+            <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isEmpl">职员</el-checkbox>
+            <!--<el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isStock">库存</el-checkbox>-->
+            <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isManual" style="margin-left: 50px"
+              >允许手工凭证使用</el-checkbox
+            >
+            <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isDc">应收/应付科目</el-checkbox>
+            <el-checkbox size="medium" :true-label="1" :false-label="0" v-model="form.isArAp">预收/预付科目</el-checkbox>
+          </el-form-item>
+        </el-col>
 
-                <el-row v-if="form.isItem == 0">
-                    <el-col :span="24">
-                        <el-form-item label="单价" prop="price">
-                            <el-input style="width: 100%;" v-model="form.price"
-                                      size="small" autocomplete="off" @blur="countBlur"
-                                      clearable placeholder="请输入单价" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="期初借方数量" prop="quantityOpenDr" label-width="100px" >
-                            <el-input style="width: 100%;" v-model="form.quantityOpenDr"
-                                      size="small" autocomplete="off" @blur="countBlur"
-                                      clearable placeholder="请输入期初借方数量" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6" v-if="form.curCode == 'USD'">
-                        <el-form-item label="期初借方金额" prop="amountOpenDrUsd" label-width="100px">
-                            <el-input style="width: 100%;" v-model="form.amountOpenDrUsd"
-                                      size="small" autocomplete="off" :disabled="true"
-                                      clearable placeholder="请输入期初借方金额" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6" v-if="form.curCode == 'CNY'">
-                        <el-form-item label="期初借方金额" prop="quantityOpenDr" label-width="100px">
-                            <el-input style="width: 100%;" v-model="form.amountOpenDr"
-                                      size="small" autocomplete="off" :disabled="true"
-                                      clearable placeholder="请输入期初借方金额" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="期初贷方数量" prop="quantityOpenCr" label-width="100px" >
-                            <el-input style="width: 100%;" v-model="form.quantityOpenCr"
-                                      size="small" autocomplete="off" @blur="countBlur"
-                                      clearable placeholder="请输入期初贷方数量" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6" v-if="form.curCode == 'USD'" >
-                        <el-form-item label="期初贷方金额" prop="amountOpenCrUsd" label-width="100px">
-                            <el-input style="width: 100%;" v-model="form.amountOpenCrUsd"
-                                      size="small" autocomplete="off" :disabled="true"
-                                      clearable placeholder="请输入期初贷方金额" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6" v-if="form.curCode == 'CNY'" >
-                        <el-form-item label="期初贷方金额" prop="amountOpenCr" label-width="100px">
-                            <el-input style="width: 100%;" v-model="form.amountOpenCr"
-                                      size="small" autocomplete="off" :disabled="true"
-                                      clearable placeholder="请输入期初贷方金额" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="本期借方数量" prop="quantityDr" label-width="100px" >
-                            <el-input style="width: 100%;" v-model="form.quantityDr"
-                                      size="small" autocomplete="off" @blur="countBlur"
-                                      clearable placeholder="请输入本期借方数量" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6" v-if="form.curCode == 'USD'" >
-                        <el-form-item label="本期借方金额" prop="amountDrUsd" label-width="100px">
-                            <el-input style="width: 100%;" v-model="form.amountDrUsd"
-                                      size="small" autocomplete="off" :disabled="true"
-                                      clearable placeholder="请输入本期借方金额" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6" v-if="form.curCode == 'CNY'" >
-                        <el-form-item label="本期借方金额" prop="amountDr" label-width="100px">
-                            <el-input style="width: 100%;" v-model="form.amountDr"
-                                      size="small" autocomplete="off" :disabled="true"
-                                      clearable placeholder="请输入本期借方金额" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="本期贷方数量" prop="quantityCr" label-width="100px" >
-                            <el-input style="width: 100%;" v-model="form.quantityCr"
-                                      size="small" autocomplete="off"
-                                      clearable placeholder="请输入本期贷方数量" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6" v-if="form.curCode == 'USD'" >
-                        <el-form-item label="本期贷方金额" prop="amountCrUsd" label-width="100px">
-                            <el-input style="width: 100%;" v-model="form.amountCrUsd"
-                                      size="small" autocomplete="off" :disabled="true"
-                                      clearable placeholder="请输入本期贷方金额" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6" v-if="form.curCode == 'CNY'" >
-                        <el-form-item label="本期贷方金额" prop="amountCr" label-width="100px">
-                            <el-input style="width: 100%;" v-model="form.amountCr"
-                                      size="small" autocomplete="off" :disabled="true"
-                                      clearable placeholder="请输入本期贷方金额" >
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+        <el-row :gutter="20" v-if="form.isItem == 1">
+          <el-col :span="12">
+            <el-form-item label="项目大类:" prop="itemClassifyId">
+              <search-query
+                :datalist="itemClassifyList"
+                :selectValue="form.itemClassifyId"
+                :filterable="true"
+                :clearable="false"
+                :buttonIf="false"
+                placeholder="请选择项目大类"
+                :forParameter="{ key: 'id', label: 'code', value: 'id' }"
+                @corpChange="corpChange($event, 'itemClassifyId')"
+              >
+              </search-query>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-            </el-row>
-        </el-form>
-    </div>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <span style="padding-left: 4em">本币期初</span>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="年初借方" prop="amountOpenDr" label-width="60px">
+              <el-input
+                style="width: 100%"
+                v-model="form.amountOpenDr"
+                size="small"
+                autocomplete="off"
+                :disabled="isCalc || !isDetail"
+                clearable
+                placeholder="请输入年初借方金额"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="年初贷方" prop="amountOpenCr" label-width="60px">
+              <el-input
+                style="width: 100%"
+                v-model="form.amountOpenCr"
+                size="small"
+                autocomplete="off"
+                :disabled="isCalc || !isDetail"
+                clearable
+                placeholder="请输入年初贷方金额"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="年初余额" prop="amountOpenBlc" label-width="60px">
+              <el-input style="width: 100%" v-model="form.amountOpenBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="本年借方" prop="amountDr" label-width="60px">
+              <el-input
+                style="width: 100%"
+                v-model="form.amountDr"
+                size="small"
+                autocomplete="off"
+                :disabled="isCalc || !isDetail"
+                clearable
+                placeholder="请输入本初借方金额"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="本年贷方" prop="amountCr" label-width="60px">
+              <el-input
+                style="width: 100%"
+                v-model="form.amountCr"
+                size="small"
+                autocomplete="off"
+                :disabled="isCalc || !isDetail"
+                clearable
+                placeholder="请输入本年贷方金额"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="当前余额" prop="amountBlc" label-width="60px">
+              <el-input style="width: 100%" v-model="form.amountBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" v-if="form.curCode !== 'CNY'">
+          <el-col :span="24">
+            <span style="padding-left: 4em">外币期初</span>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="年初借方" prop="amountOpenDrUsd" label-width="60px">
+              <el-input
+                style="width: 100%"
+                v-model="form.amountOpenDrUsd"
+                size="small"
+                autocomplete="off"
+                :disabled="isCalc || !isDetail"
+                clearable
+                placeholder="请输入年初借方金额"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="年初贷方" prop="amountOpenCrUsd" label-width="60px">
+              <el-input
+                style="width: 100%"
+                v-model="form.amountOpenCrUsd"
+                size="small"
+                autocomplete="off"
+                :disabled="isCalc || !isDetail"
+                clearable
+                placeholder="请输入年初贷方金额"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="年初余额" prop="amountOpenUsdBlc" label-width="60px">
+              <el-input style="width: 100%" v-model="form.amountOpenUsdBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="本年借方" prop="amountDrUsd" label-width="60px">
+              <el-input
+                style="width: 100%"
+                v-model="form.amountDrUsd"
+                size="small"
+                autocomplete="off"
+                :disabled="isCalc || !isDetail"
+                clearable
+                placeholder="请输入本初借方金额"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="本年贷方" prop="amountCrUsd" label-width="60px">
+              <el-input
+                style="width: 100%"
+                v-model="form.amountCrUsd"
+                size="small"
+                autocomplete="off"
+                :disabled="isCalc || !isDetail"
+                clearable
+                placeholder="请输入本年贷方金额"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="当前余额" prop="amountUsdBlc" label-width="60px">
+              <el-input style="width: 100%" v-model="form.amountUsdBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" v-if="form.isQuantity == 1">
+          <el-col :span="24">
+            <span style="padding-left: 4em">数量期初</span>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="年初借方" prop="quantityOpenDr" label-width="60px">
+              <el-input
+                style="width: 100%"
+                v-model="form.quantityOpenDr"
+                size="small"
+                autocomplete="off"
+                :disabled="isCalc || !isDetail"
+                clearable
+                placeholder="请输入年初借方金额"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="年初贷方" prop="quantityOpenCr" label-width="60px">
+              <el-input
+                style="width: 100%"
+                v-model="form.quantityOpenCr"
+                size="small"
+                autocomplete="off"
+                :disabled="isCalc || !isDetail"
+                clearable
+                placeholder="请输入年初贷方金额"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="年初余额" prop="quantityOpenBlc" label-width="60px">
+              <el-input style="width: 100%" v-model="form.quantityOpenBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="本年借方" prop="quantityDr" label-width="60px">
+              <el-input
+                style="width: 100%"
+                v-model="form.quantityDr"
+                size="small"
+                autocomplete="off"
+                :disabled="isCalc || !isDetail"
+                clearable
+                placeholder="请输入本初借方金额"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="本年贷方" prop="quantityCr" label-width="60px">
+              <el-input
+                style="width: 100%"
+                v-model="form.quantityCr"
+                size="small"
+                autocomplete="off"
+                :disabled="isCalc || !isDetail"
+                clearable
+                placeholder="请输入本年贷方金额"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="当前余额" prop="quantityBlc" label-width="60px">
+              <el-input style="width: 100%" v-model="form.quantityBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-row>
+    </el-form>
+  </div>
 </template>
 
 <script>
@@ -212,7 +359,11 @@ export default {
         form:{
             type:Object,
             default:{}
-        }
+        },
+        itemClassifyList:{
+          type: Object,
+          default:[]
+        },
     },
     data(){
         return {
@@ -230,9 +381,20 @@ export default {
             curData:[], // 币别数据
             unitNoData:[], // 单位
             propertyData:[], // 核算项目数据
+            itemClassifyList:[], // 核算大类
 
         }
     },
+    mounted() {
+    },
+    computed: {
+      isCalc(){
+        return this.form && (this.form.isCorp == 1 || this.form.isDept == 1 || this.form.isEmpl == 1 || this.form.isItem == 1 );
+      },
+      isDetail(){
+        return this.form && this.form.isDetail == 1;
+      },
+    },
     methods:{
         // 科目代码只能输入整数数字
         numinput(val){
@@ -279,15 +441,22 @@ export default {
         },
         // 下拉回调
         corpChange(value,name){
-            if (name == 'curCode') {
+            if (name === 'curCode') {
                 for (let item of this.curData) {
                     if (item.code == value) {
                         this.$set(this.form,'curCode',item.code)
                         this.$set(this.form,'exrate',item.exrate)
                     }
                 }
+            }else if (name === 'itemClassifyId') {
+              this.$set(this.form, name, value)
+              let cl = this.itemClassifyList.find(item=>item.id == value)
+              if(cl){
+                this.$set(this.form, "itemClassify", cl.cnName)
+              }
+              console.log(this.form)
             }else {
-                this.$set(this.form,name,value)
+                this.$set(this.form, name, value)
             }
         },
         // 获取币别数据
@@ -304,7 +473,7 @@ export default {
         },
         // 核算项目数据
         propertyWorkDictsfun(cnName){
-            getWorkDicts('itemClassify_los').then((res) => {
+            getWorkDicts('account_propertys').then((res) => {
                 this.propertyData = res.data.data
             });
         },
@@ -315,6 +484,6 @@ export default {
 
 <style scoped>
 ::v-deep.el-form-item {
-    margin-bottom: 0;
+  margin-bottom: 0;
 }
 </style>

+ 270 - 143
src/views/iosBasicData/accounts/index.vue

@@ -24,6 +24,8 @@
             id="out-table"
             :header-cell-class-name="headerClassName"
             ref="crud"
+            :row-style="{ height: '26px', padding: '0' }"
+            :cell-style="{ padding: '0' }"
             @row-update="rowUpdate"
             @row-save="rowSave"
             @row-del="rowDel"
@@ -53,17 +55,26 @@
             </template>
             <template slot="menu" slot-scope="{ row, index }">
               <el-button size="small" icon="el-icon-edit" type="text" :disabled="row.count == 1" @click="editfun(row, index)">编辑</el-button>
-              <!--<el-button v-if="row.isItem == 1" size="small" type="text" @click="editOpeningfun(row,index)">核算期初</el-button>-->
               <el-button size="small" type="text" :disabled="row.count == 1" @click="addChildfun(row, index)">添加子项</el-button>
-              <el-button size="small" icon="el-icon-delete" type="text" :disabled="row.count == 1" @click="rowDel(row, index)">删 除</el-button>
+              <el-button
+                v-if="row.isCorp == 1 || row.isDept == 1 || row.isEmpl == 1 || row.isItem == 1"
+                size="small"
+                type="text"
+                @click="editOpeningfun(row, index)"
+                >核算期初</el-button
+              >
+              <el-button size="small" icon="el-icon-delete" type="text" :disabled="row.count == 1" @click="rowDel(row, index)">删除</el-button>
             </template>
             <template slot="code" slot-scope="{ row }">
               <span style="color: #1e9fff" @click="editDetailsfun(row.id)">{{ row.code }}</span>
             </template>
+
+            <!-- 核算部门、职员、客户、项目都要显示期初余额
             <template slot="isItem" slot-scope="{ row }">
               <span class="pointerClick" v-if="row.isItem == 1" @click="editOpeningfun(row)">是</span>
               <span v-else>否</span>
             </template>
+            -->
             <template slot="quantityOpenDr" slot-scope="{ row }">
               <el-input-number
                 style="width: 100%"
@@ -94,7 +105,7 @@
       :close-on-click-modal="false"
       :before-close="handleClose"
     >
-      <accounts-dialog ref="accountsDialog" :form="form"></accounts-dialog>
+      <accounts-dialog ref="accountsDialog" :form="form" :itemClassifyList="itemClassifyList"></accounts-dialog>
       <span slot="footer" class="dialog-footer">
         <el-button @click="accountsVisible = false">取 消</el-button>
         <el-button type="primary" @click="bigSavefun">确 定</el-button>
@@ -132,6 +143,7 @@ import {
   getAccountsLazyTree,
   balanceCheck,
   accountsPost,
+  getItemClassifyList,
 } from "@/api/iosBasicData/accounts";
 import { mapGetters } from "vuex";
 import accountsDialog from "@/views/iosBasicData/accounts/assembly/accountsDialog.vue";
@@ -203,7 +215,7 @@ export default {
         viewBtn: true,
         selection: true,
         dialogClickModal: false,
-        menuWidth: "200",
+        menuWidth: "260",
         lazy: true,
         tree: true,
         rowKey: "code",
@@ -247,6 +259,7 @@ export default {
           {
             label: "外币",
             prop: "isForeign",
+            align: "center",
             overHidden: true,
             search: true,
             type: "select",
@@ -265,6 +278,7 @@ export default {
           {
             label: "币种",
             prop: "curCode",
+            align: "center",
             overHidden: true,
             search: true,
             width: 50,
@@ -290,6 +304,7 @@ export default {
           {
             label: "客户",
             prop: "isCorp",
+            align: "center",
             overHidden: true,
             search: true,
             type: "select",
@@ -308,6 +323,7 @@ export default {
           {
             label: "部门",
             prop: "isDept",
+            align: "center",
             overHidden: true,
             search: true,
             type: "select",
@@ -326,6 +342,7 @@ export default {
           {
             label: "职员",
             prop: "isEmpl",
+            align: "center",
             overHidden: true,
             search: true,
             type: "select",
@@ -341,31 +358,40 @@ export default {
               },
             ],
           },
-          // {
-          //   label: "项目",
-          //   prop: "isItem",
-          //   overHidden: true,
-          //   search: true,
-          //   type:'select',
-          //     width: "50",
-          //   dicData:[
-          //       {
-          //           label:'否',
-          //           value:0,
-          //       },
-          //       {
-          //           label:'是',
-          //           value:1,
-          //       }
-          //   ]
-          // },
           {
-            label: "是否生成过凭证",
+            label: "项目",
+            prop: "isItem",
+            align: "center",
+            overHidden: true,
+            search: true,
+            type: "select",
+            width: 50,
+            dicData: [
+              {
+                label: "否",
+                value: 0,
+              },
+              {
+                label: "是",
+                value: 1,
+              },
+            ],
+          },
+          {
+            label: "项目大类",
+            prop: "itemClassify",
+            overHidden: true,
+            search: true,
+            width: 120,
+          },
+          {
+            label: "有凭证",
             prop: "count",
+            align: "center",
             overHidden: true,
             search: false,
             type: "select",
-            width: 120,
+            width: 60,
             dicData: [
               {
                 label: "否",
@@ -378,23 +404,25 @@ export default {
             ],
           },
           {
-            label: "允许手工凭证使用",
+            label: "手工",
             prop: "isManual",
+            align: "center",
             overHidden: true,
             search: false,
             type: "select",
-            width: 120,
+            width: 50,
             dicData: [
               {
                 label: "否",
-                value: "0",
+                value: 0,
               },
               {
                 label: "是",
-                value: "1",
+                value: 1,
               },
             ],
           },
+          /*
           {
             label: "应收/应付科目",
             prop: "isDc",
@@ -431,6 +459,7 @@ export default {
               },
             ],
           },
+          */
           {
             label: "上级科目",
             prop: "parentCode",
@@ -443,112 +472,163 @@ export default {
           //     hasChildren:true,
           // },
           {
-            label: "期初数量借方",
-            prop: "quantityOpenDr",
-            width: 120,
-            overHidden: true,
-          },
-          {
-            label: "期初本币借方金额",
-            prop: "amountOpenDr",
-            width: 120,
-            overHidden: true,
-          },
-          {
-            label: "期初外币借方金额",
-            prop: "amountOpenDrUsd",
-            width: 120,
-            overHidden: true,
-          },
-          {
-            label: "期初数量贷方",
-            prop: "quantityOpenCr",
-            overHidden: true,
-            width: 120,
-          },
-          {
-            label: "期初本币贷方金额",
-            prop: "amountOpenCr",
-            overHidden: true,
-            width: 120,
-          },
-          {
-            label: "期初外币贷方金额",
-            prop: "amountOpenCrUsd",
-            overHidden: true,
-            width: 120,
-          },
-          {
-            label: "期初数量余额",
-            prop: "quantityOpenUsdBlc",
-            overHidden: true,
-            width: 120,
-          },
-          {
-            label: "期初本币余额",
-            prop: "amountOpenBlc",
-            overHidden: true,
-            width: 120,
-          },
-          {
-            label: "期初外币余额",
-            prop: "amountOpenUsdBlc",
-            overHidden: true,
-            width: 120,
-          },
-          {
-            label: "本期数量借方",
-            prop: "quantityDr",
-            width: 120,
-            overHidden: true,
-          },
-          {
-            label: "本期本币借方金额",
-            prop: "amountDr",
-            width: 120,
-            overHidden: true,
-          },
-          {
-            label: "本期外币借方金额",
-            prop: "amountDrUsd",
-            width: 120,
-            overHidden: true,
-          },
-          {
-            label: "本期数量贷方",
-            prop: "quantityCr",
-            width: 120,
-            overHidden: true,
-          },
-          {
-            label: "本期本币贷方金额",
-            prop: "amountCr",
-            width: 120,
-            overHidden: true,
-          },
-          {
-            label: "本期外币贷方金额",
-            prop: "amountCrUsd",
-            width: 120,
-            overHidden: true,
-          },
-          {
-            label: "本期数量余额",
-            prop: "quantityUsdBlc",
-            width: 120,
-            overHidden: true,
+            label: "本币",
+            children: [
+              {
+                label: "期初借方",
+                prop: "amountOpenDr",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                width: 120,
+                overHidden: true,
+              },
+              {
+                label: "期初贷方",
+                prop: "amountOpenCr",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                overHidden: true,
+                width: 120,
+              },
+              {
+                label: "期初余额",
+                prop: "amountOpenBlc",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                overHidden: true,
+                width: 120,
+              },
+              {
+                label: "本期借方",
+                prop: "amountDr",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                width: 120,
+                overHidden: true,
+              },
+              {
+                label: "本期贷方",
+                prop: "amountCr",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                width: 120,
+                overHidden: true,
+              },
+              {
+                label: "本期余额",
+                prop: "amountBlc",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                width: 120,
+                overHidden: true,
+              },
+            ],
           },
           {
-            label: "本期本币余额",
-            prop: "amountBlc",
-            width: 120,
-            overHidden: true,
+            label: "外币",
+            children: [
+              {
+                label: "期初借方",
+                prop: "amountOpenDrUsd",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                width: 120,
+                overHidden: true,
+              },
+              {
+                label: "期初贷方",
+                prop: "amountOpenCrUsd",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                overHidden: true,
+                width: 120,
+              },
+              {
+                label: "期初余额",
+                prop: "amountOpenUsdBlc",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                overHidden: true,
+                width: 120,
+              },
+              {
+                label: "本期借方",
+                prop: "amountDrUsd",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                width: 120,
+                overHidden: true,
+              },
+              {
+                label: "本期贷方",
+                prop: "amountCrUsd",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                width: 120,
+                overHidden: true,
+              },
+              {
+                label: "本期余额",
+                prop: "amountUsdBlc",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                width: 120,
+                overHidden: true,
+              },
+            ],
           },
           {
-            label: "本期外币余额",
-            prop: "amountUsdBlc",
-            width: 120,
-            overHidden: true,
+            label: "数量",
+            children: [
+              {
+                label: "期初借方",
+                prop: "quantityOpenDr",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                width: 120,
+                overHidden: true,
+              },
+              {
+                label: "期初贷方",
+                prop: "quantityOpenCr",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                overHidden: true,
+                width: 120,
+              },
+              {
+                label: "期初余额",
+                prop: "quantityOpenUsdBlc",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                overHidden: true,
+                width: 120,
+              },
+              {
+                label: "本期借方",
+                prop: "quantityDr",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                width: 120,
+                overHidden: true,
+              },
+              {
+                label: "本期贷方",
+                prop: "quantityCr",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                width: 120,
+                overHidden: true,
+              },
+              {
+                label: "本期余额",
+                prop: "quantityUsdBlc",
+                align: "right",
+                formatter: (row, value) => this.formatAmt(row, value, 2),
+                width: 120,
+                overHidden: true,
+              },
+            ],
           },
           {
             label: "备注",
@@ -560,6 +640,7 @@ export default {
       },
       data: [],
       propertyData: [], // 科目类别
+      itemClassifyList: [], // 核算大类
     };
   },
   components: { accitemsopenblc, accountsDialog, accountsDetails },
@@ -583,9 +664,30 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(323), this.optionBack);
+    this.option.column.forEach((col) => {
+      this.setColumnFormat(col);
+    });
     this.propertyWorkDictsfun();
   },
   methods: {
+    formatAmt(row, value, d) {
+      let amt = Number(value);
+      let s = isNaN(amt) ? "" : amt.toFixed(d ? d : 2);
+      let z = 0.0;
+      return s === z.toFixed(d ? d : 2) ? "" : s;
+    },
+    setColumnFormat(col) {
+      if (col) {
+        if (col.prop && (col.prop.startsWith("amount") || col.prop.startsWith("quantity"))) {
+          col.formatter = (row, value) => this.formatAmt(row, value, 2);
+        }
+        if (Array.isArray(col.children)) {
+          col.children.forEach((ele) => {
+            this.setColumnFormat(ele);
+          });
+        }
+      }
+    },
     balanceCheck,
     nodeClick(data) {
       this.treeAccCode = data.code;
@@ -600,20 +702,43 @@ export default {
     },
     // 核算项目数据
     propertyWorkDictsfun(cnName) {
-      getWorkDicts("itemClassify_los").then((res) => {
+      getWorkDicts("account_propertys").then((res) => {
         this.propertyData = res.data.data;
       });
+
+      // itemClassifyList
+      getItemClassifyList().then((res) => {
+        this.itemClassifyList = res.data.data.records;
+      });
     },
     // 添加
     addAccountsfun() {
       if (this.selectionList.length > 1) {
         return this.$message.warning("只能选择一条数据");
       }
-      this.form = {};
+      let property = this.query.property ? this.query.property : this.propertyData[0].dictKey;
+      this.form = {
+        property: property + "",
+        isCorp: 0,
+        isDept: 0,
+        isEmpl: 0,
+        isItem: 0,
+        isManual: 0,
+        isDc: 0,
+        isArAp: 0,
+        curCode: "CNY",
+        dc: "D",
+        code: "",
+        cnName: "",
+        enName: "",
+        isDetail: 1,
+      };
       if (this.selectionList.length == 1) {
         if (this.selectionList[0].count == 1) {
           return this.$message.warning("当前科目已经生成凭证");
         }
+        this.$set(this.form, "property", this.selectionList[0].property + "");
+        this.$set(this.form, "dc", this.selectionList[0].dc);
         getAccountsCode({ code: this.selectionList[0].code }).then((res) => {
           this.$set(this.form, "code", res.data.data);
         });
@@ -623,9 +748,6 @@ export default {
           this.$set(this.form, "code", res.data.data);
         });
       }
-      // 复制上默认值
-      this.form.isItem = "0";
-      this.form.curCode = "CNY";
       // 打开弹窗
       this.accountsVisible = true;
       // this.isShow = false
@@ -636,6 +758,7 @@ export default {
       accountsDetail(id).then((res) => {
         this.form = res.data.data;
         this.$set(this.form, "property", this.form.property + "");
+        console.log(this.form);
       });
       this.accountsVisible = true;
     },
@@ -732,6 +855,7 @@ export default {
       accountsDetail(row.id).then((res) => {
         this.form = res.data.data;
         this.$set(this.form, "property", this.form.property + "");
+        console.log("editfun", this.form);
       });
       this.accountsVisible = true;
       this.$nextTick(() => {
@@ -744,20 +868,23 @@ export default {
         parentId: row.id,
         parentCode: row.code,
         parentCnName: row.cnName,
+        isDetail: 1,
       };
       getAccountsCode({ code: row.code }).then((res) => {
         this.$set(this.form, "code", res.data.data);
       });
       // 复制上默认值
-      let copyFlds = "dc,property,isArAp,isBank,isManual,isDiary";
+      let copyFlds = "dc,property,isArAp,isDc,isManual,isDiary,isBank,curCode";
       copyFlds.split(",").forEach((item) => {
-        if (row[item]) {
-          this.form[item] = row[item];
+        if (row.hasOwnProperty(item)) {
+          this.$set(this.form, item, row[item]);
         }
       });
-      this.form.property = this.form.property + "";
-      this.form.isItem = "0";
-      this.form.curCode = "CNY";
+      this.$set(this.form, "property", this.form.property + "");
+      this.$set(this.form, "isDept", 0);
+      this.$set(this.form, "isCorp", 0);
+      this.$set(this.form, "isEmpl", 0);
+      this.$set(this.form, "isItem", 0);
 
       this.accountsVisible = true;
     },
@@ -816,9 +943,9 @@ export default {
       try {
         await accountsPost().then((res) => {
           let postedAccounts = Array.isArray(res.data.data) ? res.data.data : [];
-          if(postedAccounts.length > 0) {
+          if (postedAccounts.length > 0) {
             this.$message.success(`本次入账 ${postedAccounts.length} 个科目!`);
-          }else{
+          } else {
             this.$message.warning("没有入账任何科目!");
           }
         });

+ 20 - 20
src/views/iosBasicData/bcorps/index.vue

@@ -202,7 +202,7 @@ export default {
           {
             label: "编码",
             prop: "code",
-            width: "180",
+            width: 180,
             search: true,
             rules: [{
               required: true,
@@ -212,9 +212,20 @@ export default {
             overHidden: true,
           },
           {
+            label: "简称",
+            prop: "shortName",
+            width: 140,
+            rules: [{
+              required: true,
+              message: "请输入简称",
+              trigger: "blur"
+            }],
+            overHidden: true,
+          },
+          {
             label: "中文名称",
             prop: "cnName",
-            width: "180",
+            width: 180,
             search: true,
             rules: [{
               required: true,
@@ -226,7 +237,7 @@ export default {
           {
             label: "英文名称",
             prop: "enName",
-            width: "180",
+            width: 180,
             search: true,
             rules: [{
               required: true,
@@ -255,17 +266,6 @@ export default {
           //     trigger: "blur"
           //   }]
           // },
-          {
-            label: "简称",
-            prop: "shortName",
-            width: "180",
-            rules: [{
-              required: true,
-              message: "请输入简称",
-              trigger: "blur"
-            }],
-            overHidden: true,
-          },
           // {
           //   label: "国家代码",
           //   prop: "cntyCode",
@@ -295,7 +295,7 @@ export default {
           {
             label: "中文地址",
             prop: "cnAddr",
-            width: "200",
+            width: 200,
             search: true,
             rules: [{
               required: true,
@@ -307,7 +307,7 @@ export default {
           {
             label: "英文地址",
             prop: "enAddr",
-            width: "200",
+            width: 200,
             search: true,
             rules: [{
               required: true,
@@ -319,7 +319,7 @@ export default {
           {
             label: "电话",
             prop: "tel",
-            width: "120",
+            width: 120,
             search: true,
             rules: [{
               required: true,
@@ -364,7 +364,7 @@ export default {
           {
             label: "客户类型",
             prop: "corpTypeName",
-            width: "140",
+            width: 140,
             rules: [{
               required: true,
               message: "请输入客户类型",
@@ -395,7 +395,7 @@ export default {
           {
             label: "分管员",
             prop: "adminProfilesName",
-            width: "100",
+            width: 100,
             rules: [{
               required: true,
               message: "请输入分管员",
@@ -427,7 +427,7 @@ export default {
             prop: "remarks",
             span: 24,
             type: 'textarea',
-            width: "180",
+            width: 180,
             slot: true,
             minRows: 3,
             overHidden: true,

+ 13 - 3
src/views/iosBasicData/bports/index.vue

@@ -305,10 +305,20 @@ export default {
                 overHidden: true,
             },
             {
-                label: "CSAV",
-                prop: "CSAV",
+                label: "EP",
+                prop: "EP",
                 overHidden: true,
             },
+          {
+            label: "CMA",
+            prop: "CMA",
+            overHidden: true,
+          },
+          {
+            label: "ONE",
+            prop: "ONE",
+            overHidden: true,
+          },
             {
                 label: "QQCT",
                 prop: "QQCT",
@@ -684,7 +694,7 @@ export default {
         const data = res.data.data;
         this.page.total = data.total;
         // INTTRA,MAEU,OOCL,APL,PIL,HJ,HMM,ESL,ZIM,PO,MSC,CSAV,QQCT,CTM,SML
-        var cols = 'INTTRA,MAEU,OOCL,APL,PIL,HJ,HMM,ESL,ZIM,PO,MSC,CSAV,QQCT,CTM,SML'.split(',');
+        var cols = 'INTTRA,MAEU,OOCL,APL,PIL,HJ,HMM,ESL,ZIM,PO,MSC,EP,ONE,CMA,QQCT,CTM,SML'.split(',');
         data.records.forEach(r=>{
             cols.forEach(col=>{
                 r[col]=''

+ 382 - 239
src/views/iosBasicData/editypes/index.vue

@@ -1,18 +1,34 @@
 <template>
   <div>
     <basic-container>
-      <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
-        :before-open="beforeOpen" v-model="form" ref="crud" id="out-table" :header-cell-class-name="headerClassName"
-        @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @search-change="searchChange"
-        @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
-        @size-change="sizeChange" @refresh-change="refreshChange"
+      <avue-crud
+        :option="option"
+        :table-loading="loading"
+        :data="data"
+        :page.sync="page"
+        :permission="permissionList"
+        :before-open="beforeOpen"
+        v-model="form"
+        ref="crud"
+        id="out-table"
+        :header-cell-class-name="headerClassName"
+        @row-update="rowUpdate"
+        @row-save="rowSave"
+        @row-del="rowDel"
+        @search-change="searchChange"
+        @search-reset="searchReset"
+        @selection-change="selectionChange"
+        @current-change="currentChange"
+        @size-change="sizeChange"
+        @refresh-change="refreshChange"
         @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 325)"
-        @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 325)" @on-load="onLoad">
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 325)"
+        @on-load="onLoad"
+      >
         <template slot="menuLeft">
-          <el-button type="success" size="small" icon="el-icon-plus" plain @click="addfun">新建
-          </el-button>
-          <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">删 除
-          </el-button>
+          <el-button type="success" size="small" icon="el-icon-plus" plain @click="addfun">新建 </el-button>
+          <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">删除 </el-button>
+          <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleVerifyEdiCodes">校验 EDI CODES </el-button>
         </template>
         <!--              <template slot="corpCnNameForm">-->
         <!--                  <search-query :datalist="corpData"-->
@@ -28,75 +44,146 @@
         <!--                  </search-query>-->
         <!--              </template>-->
         <template slot="addressForm">
-          <el-button type="success" size="small" icon="el-icon-plus" plain @click="ressButton">发送
-          </el-button>
+          <el-button type="success" size="small" icon="el-icon-plus" plain @click="ressButton">发送 </el-button>
         </template>
         <template slot="userlistForm">
           <!-- <search-query :datalist="userData" :selectValue="form.userlist" :clearable="true" :multiple="true"
             :collapseTags="false" :buttonIf="false" :forParameter="{ key: 'id', label: 'roleName', value: 'id' }"
             @corpChange="corpChange($event, 'userlist')" @corpFocus="getRoleListfun">
           </search-query> -->
-          <dic-select v-model="form.userlist" placeholder="权限用户" key="id" keyValue="id" label="realName"
-            url="/blade-user/userListAll" :filterable="true" :multiple="true" :sortable="true"  dataName="realName"
-           ></dic-select>
+          <dic-select
+            v-model="form.userlist"
+            placeholder="权限用户"
+            key="id"
+            keyValue="id"
+            label="realName"
+            url="/blade-user/userListAll"
+            :filterable="true"
+            :multiple="true"
+            :sortable="true"
+            dataName="realName"
+          ></dic-select>
         </template>
         <template slot="rolelistForm">
-          <dic-select v-model="form.rolelist" placeholder="权限角色" key="id" keyValue="id" label="roleName"
-            url="/blade-system/role/list" :filterable="true" :multiple="true" :sortable="true"
+          <dic-select
+            v-model="form.rolelist"
+            placeholder="权限角色"
+            key="id"
+            keyValue="id"
+            label="roleName"
+            url="/blade-system/role/list"
+            :filterable="true"
+            :multiple="true"
+            :sortable="true"
           ></dic-select>
         </template>
         <template slot="teamlistForm">
-          <dic-select v-model="form.teamlist" placeholder="权限团队" key="id" keyValue="id" label="postName"
-            url="/blade-system/post/listAll" :filterable="true" :multiple="true" :sortable="true" dataName="postName"
-           ></dic-select>
+          <dic-select
+            v-model="form.teamlist"
+            placeholder="权限团队"
+            key="id"
+            keyValue="id"
+            label="postName"
+            url="/blade-system/post/listAll"
+            :filterable="true"
+            :multiple="true"
+            :sortable="true"
+            dataName="postName"
+          ></dic-select>
         </template>
         <template slot="excludelistForm">
-          <dic-select v-model="form.excludelist" placeholder="排除用户" key="id" keyValue="id" label="realName"
-            url="/blade-user/userListAll" :filterable="true" :multiple="true" :sortable="true" dataName="realName"
-           ></dic-select>
+          <dic-select
+            v-model="form.excludelist"
+            placeholder="排除用户"
+            key="id"
+            keyValue="id"
+            label="realName"
+            url="/blade-user/userListAll"
+            :filterable="true"
+            :multiple="true"
+            :sortable="true"
+            dataName="realName"
+          ></dic-select>
         </template>
-        <template slot="menu" slot-scope="{row}">
-          <el-button type="text" size="small" icon="el-icon-edit" @click="editFun(row)">编辑
-          </el-button>
-          <el-button type="text" size="small" icon="el-icon-delete" @click="rowDel(row)">删除
-          </el-button>
-          <el-button v-if="row.status == 1" type="text" icon="el-icon-turn-off" style="color: #85e967" size="small"
-            @click.stop="statusfun(row.id, 0)">
+        <template slot="menu" slot-scope="{ row }">
+          <el-button type="text" size="small" icon="el-icon-edit" @click="editFun(row)">编辑 </el-button>
+          <el-button type="text" size="small" icon="el-icon-delete" @click="rowDel(row)">删除 </el-button>
+          <el-button
+            v-if="row.status == 1"
+            type="text"
+            icon="el-icon-turn-off"
+            style="color: #85e967"
+            size="small"
+            @click.stop="statusfun(row.id, 0)"
+          >
             启用
           </el-button>
-          <el-button v-if="row.status == 0" type="text" icon="el-icon-turn-off" style="color: #e83c3a" size="small"
-            @click.stop="statusfun(row.id, 1)">
+          <el-button
+            v-if="row.status == 0"
+            type="text"
+            icon="el-icon-turn-off"
+            style="color: #e83c3a"
+            size="small"
+            @click.stop="statusfun(row.id, 1)"
+          >
             停用
           </el-button>
         </template>
       </avue-crud>
     </basic-container>
-    <el-dialog title="配置发送数据" :visible.sync="ressVisible" width="70%" top="5vh" append-to-body class="el-dialogDeep"
-      :close-on-click-modal="false" v-dialog-drag>
+    <el-dialog
+      title="配置发送数据"
+      :visible.sync="ressVisible"
+      width="70%"
+      top="5vh"
+      append-to-body
+      class="el-dialogDeep"
+      :close-on-click-modal="false"
+      v-dialog-drag
+    >
       <div>
-        <avue-crud :option="ressOption" :data="tableData" id="out-table" :header-cell-class-name="headerClassName"
-          @row-update="ressRowupdate" @row-save="ressRowsave" @row-del="ressRowdel" ></avue-crud>
+        <avue-crud
+          :option="ressOption"
+          :data="tableData"
+          id="out-table"
+          :header-cell-class-name="headerClassName"
+          @row-update="ressRowupdate"
+          @row-save="ressRowsave"
+          @row-del="ressRowdel"
+        ></avue-crud>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="ressVisible = false; form.address = JSON.stringify(tableData)">取 消</el-button>
-        <el-button type="primary" @click="ressVisible = false; form.address = JSON.stringify(tableData)">确 定</el-button>
+        <el-button
+          @click="
+            ressVisible = false;
+            form.address = JSON.stringify(tableData);
+          "
+          >取 消</el-button
+        >
+        <el-button
+          type="primary"
+          @click="
+            ressVisible = false;
+            form.address = JSON.stringify(tableData);
+          "
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { editypesList, editypesDetail, editypesSubmit, editypesRemove } from "@/api/iosBasicData/editypes";
+import { editypesList, editypesDetail, editypesSubmit, editypesRemove, verifyEdiCodes } from "@/api/iosBasicData/editypes";
 import { mapGetters } from "vuex";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import { getBcorpslistByType } from "@/api/iosBasicData/bcorps";
-import { getList as getRoleList } from "@/api/system/role"
+import { getList as getRoleList } from "@/api/system/role";
 import { bbusinesstypeList } from "@/api/iosBasicData/bbusinesstype";
 import dicSelect from "@/components/dicSelect/main";
 export default {
   components: { SearchQuery, dicSelect },
-  props: {
-  },
+  props: {},
   data() {
     return {
       form: {
@@ -107,12 +194,12 @@ export default {
       page: {
         pageSize: 20,
         currentPage: 1,
-        total: 0
+        total: 0,
       },
       selectionList: [],
       option: {},
       optionBack: {
-        height: 'auto',
+        height: "auto",
         calcHeight: 30,
         tip: false,
         searchShow: true,
@@ -129,70 +216,88 @@ export default {
             prop: "type",
             search: true,
             overHidden: true,
-            type: 'select',
+            type: "select",
+            width: 100,
             dicData: [],
             props: {
               label: "cnName",
-              value: "code"
+              value: "code",
             },
-            rules: [{
-              required: true,
-              message: "请输入业务类型",
-              trigger: "blur"
-            }]
+            rules: [
+              {
+                required: true,
+                message: "请输入业务类型",
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "类别",
             prop: "groupName",
             type: "select",
+            width: 50,
             search: true,
-            dicData: [{
-              label: 'Booking',
-              value: 'SO'
-            }, {
-              label: 'SI',
-              value: 'SI'
-            }],
-            rules: [{
-              required: true,
-              message: "请输入类别",
-              trigger: "blur"
-            }],
+            dicData: [
+              {
+                label: "BF",
+                value: "SO",
+              },
+              {
+                label: "SI",
+                value: "SI",
+              },
+            ],
+            rules: [
+              {
+                required: true,
+                message: "请输入类别",
+                trigger: "blur",
+              },
+            ],
 
-            value: 'SO',
+            value: "SO",
             overHidden: true,
           },
           {
             label: "EDI 编码",
             prop: "code",
+            width: 140,
             search: true,
             overHidden: true,
-            rules: [{
-              required: true,
-              message: "请输入 EDI 编码,唯一",
-              trigger: "blur"
-            }]
+            rules: [
+              {
+                required: true,
+                message: "请输入 EDI 编码,唯一",
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "EDI 名称",
             prop: "cnName",
+            width: 220,
             search: true,
             overHidden: true,
-            rules: [{
-              required: true,
-              message: "请输入 EDI 中文名称",
-              trigger: "blur"
-            }]
+            rules: [
+              {
+                required: true,
+                message: "请输入 EDI 中文名称",
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "EDI 英文",
             prop: "enName",
+            width: 220,
             overHidden: true,
-            rules: [{
-              required: true,
-              message: "请输入 EDI 英文名称",
-              trigger: "blur"
-            }]
+            rules: [
+              {
+                required: true,
+                message: "请输入 EDI 英文名称",
+                trigger: "blur",
+              },
+            ],
           },
           // {
           //   label: "客户名称",
@@ -214,30 +319,35 @@ export default {
           {
             label: "发送 FTP/邮件",
             prop: "address",
+            width: 180,
             hide: true,
             overHidden: true,
           },
           {
             label: "权限用户",
             prop: "userlist",
+            width: 100,
             hide: true,
             overHidden: true,
           },
           {
             label: "权限角色",
             prop: "rolelist",
+            width: 100,
             hide: true,
             overHidden: true,
           },
           {
             label: "权限团队",
             prop: "teamlist",
+            width: 100,
             hide: true,
             overHidden: true,
           },
           {
             label: "排除用户",
             prop: "excludelist",
+            width: 100,
             hide: true,
             overHidden: true,
           },
@@ -245,44 +355,53 @@ export default {
             label: "状态",
             prop: "status",
             type: "select",
+            width: 60,
             search: true,
-            dicData: [{
-              label: '启用',
-              value: 0
-            }, {
-              label: '停用',
-              value: 1
-            }],
+            dicData: [
+              {
+                label: "启用",
+                value: 0,
+              },
+              {
+                label: "停用",
+                value: 1,
+              },
+            ],
             value: 0,
             overHidden: true,
           },
           {
             label: "创建人",
             prop: "createUserName",
+            width: 100,
             overHidden: true,
             display: false,
           },
           {
             label: "创建部门",
             prop: "createDeptName",
+            width: 100,
             overHidden: true,
             display: false,
           },
           {
             label: "创建时间",
             prop: "createTime",
+            width: 140,
             overHidden: true,
             display: false,
           },
           {
             label: "修改人",
             prop: "updateUserName",
+            width: 100,
             overHidden: true,
             display: false,
           },
           {
             label: "修改时间",
             prop: "updateTime",
+            width: 140,
             overHidden: true,
             display: false,
           },
@@ -291,10 +410,11 @@ export default {
             prop: "remarks",
             overHidden: true,
             type: "textarea",
+            width: 200,
             minRows: 3,
-            span: 24
+            span: 24,
           },
-        ]
+        ],
       },
       data: [],
       corpData: [], // 客户下拉数据
@@ -310,78 +430,90 @@ export default {
         addBtn: false,
         addRowBtn: true,
         cellBtn: true,
-        rowKey: '$index',
+        rowKey: "$index",
         menuWidth: 140,
-        column: [{
-          label: '标题',
-          prop: 'title',
-          cell: true,
-        }, {
-          label: '方式',
-          prop: 'mode',
-          cell: true,
-          type: "select",
-          dicData: [
-            {
-              label: 'FTP',
-              value: 'ftp'
-            },
-            {
-                label: 'SSL FTP',
-                value: 'sftp'
-            },
-            {
-              label: '邮件',
-              value: 'smtp'
-            }
-          ],
-          rules: [{
-            required: true,
-            message: "",
-            trigger: "blur"
-          }],
-        }, {
-          label: '主机地址',
-          prop: 'host',
-          cell: true,
-        }, {
-            label: '端口',
-            prop: 'port',
+        column: [
+          {
+            label: "标题",
+            prop: "title",
+            cell: true,
+          },
+          {
+            label: "方式",
+            prop: "mode",
+            cell: true,
+            type: "select",
+            dicData: [
+              {
+                label: "FTP",
+                value: "ftp",
+              },
+              {
+                label: "SSL FTP",
+                value: "sftp",
+              },
+              {
+                label: "邮件",
+                value: "smtp",
+              },
+            ],
+            rules: [
+              {
+                required: true,
+                message: "",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "主机地址",
+            prop: "host",
+            cell: true,
+          },
+          {
+            label: "端口",
+            prop: "port",
             cell: true,
-        }, {
-          label: '用户名称',
-          prop: 'userName',
-          cell: true,
-        }, {
-          label: '密码',
-          prop: 'password',
-          type: "password",
-          cell: true,
-        }, {
+          },
+          {
+            label: "用户名称",
+            prop: "userName",
+            cell: true,
+          },
+          {
+            label: "密码",
+            prop: "password",
+            type: "password",
+            cell: true,
+          },
+          {
             label: "被动模式",
-            prop: 'localPassiveMode',
+            prop: "localPassiveMode",
             type: "select",
             cell: true,
             dicData: [
-                {
-                    label: '是',
-                    value: '1'
-                },
-                {
-                    label: '否',
-                    value: '0'
-                }
+              {
+                label: "是",
+                value: "1",
+              },
+              {
+                label: "否",
+                value: "0",
+              },
             ],
-        },{
-            label: '邮箱地址',
-            prop: 'address',
+          },
+          {
+            label: "邮箱地址",
+            prop: "address",
             cell: true,
-        }, {
-          label: '路径',
-          prop: 'path',
-          cell: true,
-        }]
-      }
+          },
+          {
+            label: "路径",
+            prop: "path",
+            cell: true,
+          },
+        ],
+      },
     };
   },
   computed: {
@@ -391,145 +523,150 @@ export default {
         addBtn: this.vaildData(this.permission.editypes_add, false),
         viewBtn: this.vaildData(this.permission.editypes_view, false),
         delBtn: this.vaildData(this.permission.editypes_delete, false),
-        editBtn: this.vaildData(this.permission.editypes_edit, false)
+        editBtn: this.vaildData(this.permission.editypes_edit, false),
       };
     },
     ids() {
       let ids = [];
-      this.selectionList.forEach(ele => {
+      this.selectionList.forEach((ele) => {
         ids.push(ele.id);
       });
       return ids.join(",");
-    }
+    },
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(325), this.optionBack);
-    this.getRoleListfun()
-    this.bbusinesstypeListfun() // 业务类型
+    this.getRoleListfun();
+    this.bbusinesstypeListfun(); // 业务类型
   },
   methods: {
     // 获取业务类型接口
     bbusinesstypeListfun() {
       // 获取业务类型
-      bbusinesstypeList(1, 1000).then(res => {
-        this.findObject(this.option.column, "type").dicData = res.data.data.records
-      })
+      bbusinesstypeList(1, 1000).then((res) => {
+        this.findObject(this.option.column, "type").dicData = res.data.data.records;
+      });
     },
     // 禁用启用按钮
     statusfun(id, status) {
       this.$confirm("确定将选择数据更改状态?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       }).then(() => {
-        editypesDetail(id).then(res => {
+        editypesDetail(id).then((res) => {
           let obj = res.data.data;
-          obj.status = status
+          obj.status = status;
           editypesSubmit(obj).then(() => {
             this.onLoad(this.page);
             this.$message({
               type: "success",
-              message: "操作成功!"
+              message: "操作成功!",
             });
-          })
-        })
-      })
+          });
+        });
+      });
     },
     // 添加
     addfun() {
-      this.$refs.crud.rowAdd()
+      this.$refs.crud.rowAdd();
     },
     // 编辑
     editFun(row) {
-      this.$refs.crud.rowEdit(row, row.$index)
+      this.$refs.crud.rowEdit(row, row.$index);
     },
     // 下拉回调
     corpChange(value, name) {
-      if (name == 'corpCnName') {
+      if (name == "corpCnName") {
         for (let item of this.corpData) {
           if (item.cnName == value) {
-            this.$set(this.form, 'corpId', item.id)
-            this.$set(this.form, 'corpCnName', item.cnName)
-            this.$set(this.form, 'corpEnName', item.enName)
+            this.$set(this.form, "corpId", item.id);
+            this.$set(this.form, "corpCnName", item.cnName);
+            this.$set(this.form, "corpEnName", item.enName);
           }
         }
       } else {
-        this.$set(this.form, name, value)
+        this.$set(this.form, name, value);
       }
-
     },
     // 获取结算单位数据
     corpBcorpsListfun(cnName) {
-      getBcorpslistByType(1, 10, { cnName }).then(res => {
-        this.corpData = res.data.data.records
-      })
+      getBcorpslistByType(1, 10, { cnName }).then((res) => {
+        this.corpData = res.data.data.records;
+      });
     },
     // 获取权限用户数据
     getRoleListfun() {
-      getRoleList(1, 50,).then(res => {
-        this.userData = res.data.data
-      })
+      getRoleList(1, 50).then((res) => {
+        this.userData = res.data.data;
+      });
     },
     // 点击弹出表格
     ressButton() {
-      this.tableData = JSON.parse(this.form.address ? this.form.address : '[]')
-      this.ressVisible = true
+      this.tableData = JSON.parse(this.form.address ? this.form.address : "[]");
+      this.ressVisible = true;
     },
     // 弹窗表格的添加保存
     ressRowsave(row, done, loading) {
-      done(row)
+      done(row);
+    },
+    ressRowdel(row, done, loading) {
+      console.log(row);
+      let i = this.tableData.indexOf(row);
+      if (i >= 0) {
+        this.tableData.splice(i, 1);
+      }
     },
-      ressRowdel(row, done, loading){
-        console.log(row)
-          let i = this.tableData.indexOf(row);
-          if(i>=0){
-              this.tableData.splice(i, 1);
-          }
-      },
     // 弹窗表格的修改保存
     ressRowupdate(row, index, done, loading) {
-      done(row)
+      done(row);
     },
     // 新增
     rowSave(row, done, loading) {
-      row.userlist = JSON.stringify(row.userlist)
-      row.rolelist = JSON.stringify(row.rolelist)
-      row.teamlist = JSON.stringify(row.teamlist)
-      row.excludelist = JSON.stringify(row.excludelist)
-      editypesSubmit(row).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        done();
-      }, error => {
-        loading();
-        window.console.log(error);
-      });
+      row.userlist = JSON.stringify(row.userlist);
+      row.rolelist = JSON.stringify(row.rolelist);
+      row.teamlist = JSON.stringify(row.teamlist);
+      row.excludelist = JSON.stringify(row.excludelist);
+      editypesSubmit(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          loading();
+          window.console.log(error);
+        }
+      );
     },
     rowUpdate(row, index, done, loading) {
-      row.userlist = JSON.stringify(row.userlist)
-      row.rolelist = JSON.stringify(row.rolelist)
-      row.teamlist = JSON.stringify(row.teamlist)
-      row.excludelist = JSON.stringify(row.excludelist)
-      editypesSubmit(row).then(() => {
-        this.onLoad(this.page);
-        this.$message({
-          type: "success",
-          message: "操作成功!"
-        });
-        done();
-      }, error => {
-        loading();
-        console.log(error);
-      });
+      row.userlist = JSON.stringify(row.userlist);
+      row.rolelist = JSON.stringify(row.rolelist);
+      row.teamlist = JSON.stringify(row.teamlist);
+      row.excludelist = JSON.stringify(row.excludelist);
+      editypesSubmit(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          loading();
+          console.log(error);
+        }
+      );
     },
     rowDel(row) {
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           return editypesRemove(row.id);
@@ -538,7 +675,7 @@ export default {
           this.onLoad(this.page);
           this.$message({
             type: "success",
-            message: "操作成功!"
+            message: "操作成功!",
           });
         });
     },
@@ -550,7 +687,7 @@ export default {
       this.$confirm("确定将选择数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
           return editypesRemove(this.ids);
@@ -559,19 +696,27 @@ export default {
           this.onLoad(this.page);
           this.$message({
             type: "success",
-            message: "操作成功!"
+            message: "操作成功!",
           });
           this.$refs.crud.toggleSelection();
         });
     },
+    handleVerifyEdiCodes() {
+      return verifyEdiCodes().then(() => {
+        this.$message({
+          type: "success",
+          message: "校验成功!",
+        });
+      });
+    },
     beforeOpen(done, type) {
       if (["edit", "view"].includes(type)) {
-        editypesDetail(this.form.id).then(res => {
+        editypesDetail(this.form.id).then((res) => {
           this.form = res.data.data;
-          this.form.userlist = JSON.parse(this.form.userlist)
-          this.form.rolelist = JSON.parse(this.form.rolelist)
-          this.form.teamlist = JSON.parse(this.form.teamlist)
-          this.form.excludelist = JSON.parse(this.form.excludelist)
+          this.form.userlist = JSON.parse(this.form.userlist);
+          this.form.rolelist = JSON.parse(this.form.rolelist);
+          this.form.teamlist = JSON.parse(this.form.teamlist);
+          this.form.excludelist = JSON.parse(this.form.excludelist);
         });
       }
       done();
@@ -604,7 +749,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      editypesList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      editypesList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then((res) => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
@@ -639,23 +784,21 @@ export default {
     // 更改表格颜色
     headerClassName(tab) {
       //颜色间隔
-      let back = ""
+      let back = "";
       if (tab.columnIndex >= 0 && tab.column.level === 1) {
         if (tab.columnIndex % 2 === 0) {
-          back = "back-one"
+          back = "back-one";
         } else if (tab.columnIndex % 2 === 1) {
-          back = "back-two"
+          back = "back-two";
         }
       }
       return back;
     },
     // 表头样式
     tableHeaderCellStyle({ row, column, rowIndex, columnIndex }) {
-      return "padding:4px 0px;fontSize:12px;color:#000;background:#ecf5ff"
+      return "padding:4px 0px;fontSize:12px;color:#000;background:#ecf5ff";
     },
-
-
-  }
+  },
 };
 </script>
 

+ 14 - 0
src/views/iosBasicData/seamends/assembly/billgenerated.vue

@@ -117,6 +117,20 @@
                     enumerable: false, // 设置为false表示不能通过 for-in 循环返回
                     // configurable: false, // configurable 设置为 false,意味着这个属性不能从对象上删除
                 })
+
+              let style = {
+                // color: '#fff',
+                // backgroundColor: "#fbd26a"
+                // height: "24px",
+                backgroundColor: null,
+                color: row.dc==="D" ? "red" : "green"
+              }
+
+              if(row.isAmend == 1){
+                style.backgroundColor = "#efd79d"
+              }
+
+              return style;
             },
             keyDown(event) {
                 let key = event.keyCode;

+ 3 - 1
src/views/system/user.vue

@@ -83,7 +83,7 @@
 
           <el-form :inline="true">
             <el-form-item label="密码重置为:" prop="changeThePassword">
-              <el-input v-model="newPassword" placeholder="请输入内容"></el-input>
+              <el-input type="password" v-model="newPassword" placeholder="请输入内容"></el-input>
             </el-form-item>
           </el-form>
 
@@ -354,6 +354,7 @@ export default {
               {
                 label: '密码',
                 prop: 'password',
+                type: "password",
                 hide: true,
                 editDisplay: false,
                 viewDisplay: false,
@@ -362,6 +363,7 @@ export default {
               {
                 label: '确认密码',
                 prop: 'password2',
+                type: "password",
                 hide: true,
                 editDisplay: false,
                 viewDisplay: false,