Ver código fonte

优化界面

wangzhuo 1 ano atrás
pai
commit
2a00c26302

+ 6 - 4
src/views/iosBasicData/blocations/index.vue

@@ -61,6 +61,8 @@
         optionBack: {
           height:'auto',
           stripe: true,
+          searchIcon: true,
+          searchIndex: 3,
           calcHeight: 30,
           tip: false,
           searchShow: true,
@@ -153,12 +155,12 @@
             //   }]
             // },
             {
-              label: "港口编码",
+              label: "编码",
               prop: "code",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入港口编码",
+                message: "请输入编码",
                 trigger: "blur"
               }]
             },
@@ -188,7 +190,7 @@
               search: true,
             },
             {
-              label: "国家地区名称,英文",
+              label: "国家地区英文名称",
               prop: "cntyName",
               search: true,
             },
@@ -198,7 +200,7 @@
               search: true,
             },
             {
-              label: "州名称,英文",
+              label: "州英文名称",
               prop: "stateName",
               search: true,
             },

+ 153 - 13
src/views/iosBasicData/bserviceterms/index.vue

@@ -23,6 +23,17 @@
                @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 294)"
                @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 294)"
                @on-load="onLoad">
+      <!-- <template slot-scope="scope" slot="extendedDataArr">
+            <span style="color: #1e9fff" @click="extendedDataview(scope.row)">
+                {{scope.row.extendedDataArr.length}}
+            </span>
+        </template>
+        <template slot-scope="{type,disabled,row}" slot="extendedDataArrForm">
+            <el-button type="primary"
+                       size="small"
+                       @click="dialogVisible = true">EDI CODE
+            </el-button>
+        </template> -->
       <template slot="remarks" slot-scope="scope">
         <avue-text-ellipsis :text="scope.row.remarks" :height="30" use-tooltip placement="top">
           <small slot="more">...</small>
@@ -38,6 +49,62 @@
         </el-button>
       </template>
     </avue-crud>
+
+    <el-dialog
+          title="EDI CODE"
+          :visible.sync="dialogVisible"
+          width="50%"
+          append-to-body
+          :destroy-on-close="true"
+          :modal-append-to-body="false"
+          :before-close="handleClose">
+          <div>
+              <el-button type="primary"
+                         size="small"
+                         :disabled="extendedDisabled"
+                         @click="extendedDataAdd">新增
+              </el-button>
+              <el-table
+                  :data="form.extendedDataArr"
+                  style="width: 100%">
+                  <el-table-column
+                      prop="name"
+                      label="名称">
+                      <template slot-scope="{row}">
+                          <el-input v-if="row.edit" size="mini" v-model="row.name" placeholder="请输入名称"></el-input>
+                          <span v-else>{{row.name}}</span>
+                      </template>
+                  </el-table-column>
+                  <el-table-column
+                      prop="value"
+                      label="键值">
+                      <template slot-scope="{row}">
+                          <el-input v-if="row.edit" size="mini" v-model="row.value" placeholder="请输入键值"></el-input>
+                          <span v-else>{{row.value}}</span>
+                      </template>
+                  </el-table-column>
+                  <el-table-column label="操作">
+                      <template slot-scope="scope">
+                          <el-button
+                              type="text"
+                              size="mini"
+                              :disabled="extendedDisabled"
+                              @click="extendedDataEdit(scope.$index, scope.row)">{{scope.row.edit?'保存':'编辑'}}</el-button>
+                          <el-button
+                              size="mini"
+                              type="text"
+                              :disabled="extendedDisabled"
+                              @click="extendedDataDelete(scope.$index, scope.row)">删除</el-button>
+                      </template>
+                  </el-table-column>
+              </el-table>
+          </div>
+          <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false;extendedDisabled = false">取 消</el-button>
+                <el-button type="primary" @click="dialogVisible = false;extendedDisabled = false">确 定</el-button>
+          </span>
+      </el-dialog>
+
   </basic-container>
 </template>
 
@@ -48,7 +115,13 @@
   export default {
     data() {
       return {
-        form: {},
+          // 扩展数据弹窗
+          dialogVisible:false,
+
+        form: {
+            extendedDataArr:[]
+        },
+        // form: {},
         query: {},
         loading: true,
         page: {
@@ -153,9 +226,14 @@
             //   }]
             // },
             {
-              label: "条款代码",
+              label: "代码",
               prop: "code",
               search: true,
+              rules: [{
+                required: true,
+                message: "请输入代码",
+                trigger: "blur"
+              }]
             },
             {
               label: "中文名称",
@@ -178,6 +256,18 @@
               }]
             },
             // {
+            //       label: "EDI CODE",
+            //       prop: "extendedDataArr",
+            //       type:'tree',
+            //       formslot:true,
+            //       dicData:[],
+            //       rules: [{
+            //           required: true,
+            //           message: "请输入EDI CODE",
+            //           trigger: "blur"
+            //       }]
+            // },
+            // {
             //   label: "JSON 对象数组,用于不查询的扩展数据, 例如:[{name: "key1", value: "value1"}]",
             //   prop: "extendedData",
             //   rules: [{
@@ -249,7 +339,45 @@
         this.option = await this.getColumnData(this.getColumnName(294), this.optionBack);
     },
     methods: {
+      // 扩展数据详情的---------------------------------------
+        // 扩展数据添加
+        extendedDataAdd(){
+            this.form.extendedDataArr.map(item=>{
+                item.edit = false
+            })
+            this.form.extendedDataArr.push({
+                edit:true
+            })
+        },
+        // 扩展数据编辑
+        extendedDataEdit(index,row) {
+            row.edit = !row.edit
+        },
+        // 扩展数据删除
+        extendedDataDelete(index,row) {
+            this.form.extendedDataArr.splice(index,1)
+        },
+        // 扩展数据表格点击查询详情
+        extendedDataview(row){
+            this.form = row
+            this.extendedDisabled = true
+            this.dialogVisible = true
+        },
+        // 扩展数据弹窗关闭
+        handleClose(done){
+            this.$confirm('确认关闭?')
+                .then(_ => {
+                    done();
+                })
+                .catch(_ => {});
+        },
+        // 表格操作------------------------------------------------------------
       rowSave(row, done, loading) {
+          // row.extendedDataArr.map(item=>{
+          //     delete item.edit
+          // })
+          // row.extendedData = JSON.stringify(row.extendedDataArr)
+          // delete row.extendedDataArr
         addBserviceterms(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -263,17 +391,29 @@
         });
       },
       rowUpdate(row, index, done, loading) {
-        updateBserviceterms(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
+        // if (row.status === 1) {
+        //   row.extendedDataArr.map(item=>{
+        //       delete item.edit
+        //   })
+        //   row.extendedData = JSON.stringify(row.extendedDataArr)
+        //   delete row.extendedDataArr
+          updateBserviceterms(row).then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            done();
+          }, error => {
+            loading();
+            console.log(error);
           });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
+        // } else {
+        //   this.$message({
+        //     message: '非禁用状态无法修改',
+        //     type: 'warning'
+        //   });
+        // }
       },
       rowDel(row) {
         if (row.status === 1) {
@@ -418,4 +558,4 @@
   width: 24.33333%;
 }
 
-</style>
+</style>

+ 12 - 12
src/views/iosBasicData/btrademodes/index.vue

@@ -165,42 +165,42 @@
               }]
             },
             {
-              label: "单一窗口代码",
-              prop: "codeSw",
+              label: "中文名称",
+              prop: "cnName",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入单一窗口代码",
+                message: "请输入中文名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "称",
-              prop: "shortName",
+              label: "英文名称",
+              prop: "enName",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入称",
+                message: "请输入英文名称",
                 trigger: "blur"
               }]
             },
             {
-              label: "中文名称",
-              prop: "cnName",
+              label: "称",
+              prop: "shortName",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入中文名称",
+                message: "请输入称",
                 trigger: "blur"
               }]
             },
             {
-              label: "英文名称",
-              prop: "enName",
+              label: "单一窗口代码",
+              prop: "codeSw",
               search: true,
               rules: [{
                 required: true,
-                message: "请输入英文名称",
+                message: "请输入单一窗口代码",
                 trigger: "blur"
               }]
             },

+ 15 - 13
src/views/iosBasicData/bunits/index.vue

@@ -61,6 +61,8 @@
         optionBack: {
           height:'auto',
           stripe: true,
+          searchIcon: true,
+          searchIndex: 3,
           calcHeight: 30,
           tip: false,
           searchShow: true,
@@ -163,16 +165,6 @@
               }]
             },
             {
-              label: "单一窗口代码",
-              prop: "codeSw",
-              search: true,
-              rules: [{
-                required: true,
-                message: "请输入单一窗口代码",
-                trigger: "blur"
-              }]
-            },
-            {
               label: "中文名称",
               prop: "cnName",
               search: true,
@@ -193,14 +185,24 @@
               }]
             },
             {
-              label: "数量规则,用于根据单位自动计算数量",
-              prop: "quantityRule",
+              label: "单一窗口代码",
+              prop: "codeSw",
+              search: true,
               rules: [{
                 required: true,
-                message: "请输入数量规则,用于根据单位自动计算数量",
+                message: "请输入单一窗口代码",
                 trigger: "blur"
               }]
             },
+            {
+              label: "数量规则,用于根据单位自动计算数量",
+              prop: "quantityRule",
+              // rules: [{
+              //   required: true,
+              //   message: "请输入数量规则,用于根据单位自动计算数量",
+              //   trigger: "blur"
+              // }]
+            },
             // {
             //   label: "quantity_rule=FIXED 时,默认的数量",
             //   prop: "quantity",

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

@@ -149,7 +149,7 @@
         form: {
             extendedDataArr:[]
         },
-        form: {},
+        // form: {},
         query: {},
         loading: true,
         page: {
@@ -256,13 +256,13 @@
             //   }]
             // },
             {
-              label: "船舶编码",
+              label: "编码",
               prop: "code",
               search: true,
               slot: true,
               rules: [{
                 required: true,
-                message: "请输入船舶编码",
+                message: "请输入编码",
                 trigger: "blur"
               }]
             },
@@ -492,6 +492,11 @@
         },
         // 表格操作------------------------------------------------------------
       rowSave(row, done, loading) {
+          // row.extendedDataArr.map(item=>{
+          //     delete item.edit
+          // })
+          // row.extendedData = JSON.stringify(row.extendedDataArr)
+          // delete row.extendedDataArr
         addBvessels(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -506,6 +511,11 @@
       },
       rowUpdate(row, index, done, loading) {
         // if (row.status === 1) {
+          // row.extendedDataArr.map(item=>{
+          //     delete item.edit
+          // })
+          // row.extendedData = JSON.stringify(row.extendedDataArr)
+          // delete row.extendedDataArr
           updateBvessels(row).then(() => {
             this.onLoad(this.page);
             this.$message({