Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

src/model/Trnrel/Event.js

@@ -388,7 +388,7 @@ export default {
         //     this.model.trncorco.trnstm = res.data.trncorco_trnstm;
         // })
         // }
-        const res = await this.executeRule("searow")
+        const res = await this.executeRule("inftrnps,searow")
         that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
         this.model.trncorco.trnstm = res.data.trncorco_trnstm;
         this.$store.commit("setTaskList", {key: "trnrel", val: this.stmData.data.length});
@@ -404,7 +404,7 @@ export default {
     },
     async trnfndhandleSearch() {
         const that = this.root;
-        const res = await this.executeRule("searow")
+        const res = await this.executeRule("inftrnps,searow")
         that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
         this.model.trncorco.trnstm = res.data.trncorco_trnstm;
  

src/views/Business/Ditdck/Docpre.vue

@@ -168,7 +168,7 @@
             <c-button
               style="margin-left: 0"
               size="small"
-              @click="removeRow(scope.$index, scope.row)"
+              @click="removeRow(scope.$index)"
             >
               删除
             </c-button>
@@ -203,7 +203,7 @@
         </c-col>
         <!-- <c-col :span="24"> -->
         <span slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="addRow">添加</el-button>
+          <el-button type="primary" @click="addRow">确定</el-button>
           <el-button @click="addDialogVisible = false">取消</el-button>
         </span>
         <!-- </c-col> -->
@@ -229,11 +229,20 @@ export default {
         cmail2: "",
         docnam: "",
       },
-      liData:["增值税发票11","增值税发票222","增值税发票33","增值税发票44","增值税发票55"],
+      liData:["增值税发票","发票","装箱单","空运单","海运提单","铁路运单","货物收据","邮政收据","出库单","保险单","质检证","受益人证明"],
     };
   },
   methods: {
     ...Event,
+    addRow(){
+            this.addDialogVisible=false;
+            let newRow = {...this.dialog};
+            this.model.bdtp.docgrdm.docgrd.push(newRow);
+        },
+    removeRow(idx){
+        this.model.bdtp.docgrdm.docgrd.pop(idx);
+
+    }
   },
   created: function () {},
 };
@@ -242,6 +251,4 @@ export default {
 .el-checkbox >>> .el-checkbox__label {
   width: 70px;
 }
-.inputDiv {
-}
 </style>
\ No newline at end of file

src/views/Business/Sptsel/Sptbrk/Menu.vue

@@ -379,7 +379,8 @@ export default {
           '4 1 "交易代码" 70 ',
           '5 2 "业务编号" 300',
           '6 3 "交易名称" 180',
-          '1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
+          // '1 4 "状态" 60 1 tdViewTypeEdit:0 1 SPT:STA',
+          {index:1,position:4,width:100,pattern:'code',label:'状态',code:[{label:"Pending",value:"PEN"}]},
           '17 5 "报文类型" 100',
           '18 6 "对方银行BIC" 110',
           '7 7 "创建时间" 160 20 DateTime 1',