解决分支冲突

develop/@gms/gms-plugin-billexpand/src/actions/lincaoAddView.js

@@ -6,7 +6,8 @@ export default {
         const unitCode = nros.getUser().loginUnit
         c.bill = bill.dom
         const projectNum = bill.dom.getMasterData().getData().billCode.value
-        c.url =`http://${param.param.ipAddress}/jq/addAssociateDatas.do?unitCode=${unitCode}&type=${param.param.type}&projectNum=${projectNum}&year=${year}`
+        // c.url =`http://${param.param.ipAddress}/jq/addAssociateDatas.do?unitCode=${unitCode}&type=${param.param.type}&projectNum=${projectNum}&year=${year}`
+        c.url =`http://${param.param.ipAddress}/jq/addAssociateDatas.do?unitCode=130324&type=jhltlx&projectNum=1&year=2021`
         c.name = name
         c.modalShow = true;
       })

develop/@gms/gms-plugin-billexpand/src/control/lincaoView.vue

@@ -42,8 +42,12 @@ export default {
             "SHI" : datas[i].tbInfos[a].SHI_DESC,
             "XIANG" : datas[i].tbInfos[a].XIANG_DESC,
             "XIAN" : datas[i].tbInfos[a].XIAN_DESC,
+            "CUN" : datas[i].tbInfos[a].CUN_DESC,
             "MZGUID" : datas[i].tbInfos[a].MZGUID,
-            "ZL_TU_BAN" :datas[i].tbInfos[a].ZL_TU_BAN
+            "ZL_TU_BAN" :datas[i].tbInfos[a].ZL_TU_BAN,
+            "LIN_YE_JU" :datas[i].tbInfos[a].LIN_YE_JU,
+            "ZL_FS" :datas[i].tbInfos[a].ZL_FS_DESC,
+            "MIAN_JI" :datas[i].tbInfos[a].ZS_MJ,
           }  
           valueAll.push(value)
         }

develop/@gms/gms-plugin-billexpand/src/control/vxe-achievements/achievements.vue

 <template>
   <div class="bill-achievements">
-    <Button type="primary" @click="Primary">Primary</Button>
-    <vxe-table
-      border
-      ref="xTable"
-      :data="tableData"
-      :show-header="false"
-    >
+    <vxe-table border ref="xTable" :data="tableData" :show-header="false">
       <vxe-table-column
         field="name"
         title="name"
@@ -18,6 +12,12 @@
           <component
             :is="scope.row.type"
             :attr="{ field: 'value', row: scope.row, attr: scope.row.attr }"
+            :detailData="
+              scope.row.attr && scope.row.attr.tableData
+                ? scope.row.attr.tableData
+                : []
+            "
+            @dataChange="updataTableData($event, scope.$rowIndex)"
           ></component>
         </template>
       </vxe-table-column>
@@ -26,18 +26,21 @@
 </template>
 <script>
 import vxeAchievements from "./vxe-achievements.js";
-import dataControl from "./components/dataControl.vue";
+import dateControl from "./components/dateControl.vue";
 import vxeTableControl from "./components/vxe-table.vue";
 import radioGroupControl from "./components/radioGroupControl.vue";
 import inputControl from "./components/inputControl.vue";
+import textAreaControl from "./components/textAreaControl.vue";
 export default {
   mixins: [vxeAchievements],
   components: {
     vxeTableControl,
-    dataControl,
+    dateControl,
     radioGroupControl,
     inputControl,
+    textAreaControl,
   },
+
   data() {
     return {
       tableData: [
@@ -53,8 +56,8 @@ export default {
         },
         {
           name: "项目起止时间",
-          type: "dataControl",
-          value: "",
+          type: "dateControl",
+          value: [],
         },
         {
           name: "项目资金申请（万元）",
@@ -124,12 +127,12 @@ export default {
         },
         {
           name: "单位(部门)职能概述",
-          type: "inputControl",
+          type: "textAreaControl",
           value: "xx",
         },
         {
           name: "项目概况",
-          type: "inputControl",
+          type: "textAreaControl",
           value: "33",
         },
         {
@@ -160,7 +163,7 @@ export default {
                 field: "name",
                 title: "立项情况",
                 width: 230,
-                type: "inputControl"
+                type: "inputControl",
               },
               {
                 field: "value",
@@ -208,7 +211,7 @@ export default {
               {
                 field: "startTime",
                 title: "开始时间",
-                type: "dataControl",
+                type: "dateControl",
                 daterange: "date",
                 placement: "bottom",
                 align: "center",
@@ -216,7 +219,7 @@ export default {
               {
                 field: "endTime",
                 title: "完成时间",
-                type: "dataControl",
+                type: "dateControl",
                 daterange: "date",
                 placement: "bottom",
                 align: "center",
@@ -646,24 +649,71 @@ export default {
         },
         {
           name: "其他说明的问题",
-          type: "inputControl",
+          type: "textAreaControl",
           value: "",
         },
         {
           name: "填报人：",
-          type: "inputControl",
-          value: "",
+          type: "vxeTableControl",
+          attr: {
+            border:'none',
+            showHeader: false,
+            addObj: {
+              name: "",
+              value: "",
+            },
+            tableData: [
+              {
+                person: "单位（部门）负责人：",
+                time: "填报时间:",
+              }
+            ],
+            columns: [
+              {
+                field: "person",
+                title: "部门负责人",
+                type: "inputControl"
+              },
+              {
+                field: "time",
+                title: "填报时间",
+                type: "inputControl"
+              },
+            ],
+          },
         },
       ],
     };
   },
-  props: {},
-  watch: {},
+  props: {
+    define: {
+      type: Object,
+      default: () => {},
+    },
+    context: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  watch: {
+    tableData: {
+      handler(nv, ov) {
+        console.log(nv, ov);
+        if (this.define.config.field) {
+          this.context.dataObject.setValue(this.define.config.field, nv);
+        }
+      },
+      deep: true,
+    },
+  },
   computed: {},
   methods: {
     Primary() {
       console.log(this.tableData);
     },
+    updataTableData(nv, rowIndex) {
+      this.tableData[rowIndex].attr.tableData = nv;
+    },
   },
   mounted() {},
   created() {},
@@ -678,8 +728,17 @@ export default {
   margin-top: -3px;
   border: none;
 }
+.rbcInputControl textarea {
+  margin-left: -10px;
+  width: calc(100% + 18px);
+  border: none;
+}
+.rbcInputControl textarea.ivu-input {
+  max-width: inherit;
+  font-size: 14px;
+  vertical-align:revert;
+}
 .bill-achievements {
-  width: 1300px;
 
   .vxe-table--render-default .vxe-body--column:not(.col--ellipsis) {
     padding: 0;

develop/@gms/gms-plugin-billexpand/src/control/vxe-achievements/components/dateControl.vue

+<template>
+  <div class="rbcInputControl">
+    {{attr.column && attr.column.text?attr.column.text:''}}
+    <DatePicker
+      :type="
+        attr.column && attr.column.daterange
+          ? attr.column.daterange
+          : 'daterange'
+      "
+      :placement="attr.column && attr.column.placement"
+      v-model="attr.row[attr.field]"
+    ></DatePicker>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {};
+  },
+  props: {
+    attr: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  watch: {},
+  computed: {},
+  methods: {},
+  mounted() {
+    console.log('日期',this.attr.row,this.attr.field)
+  },
+  created() {},
+  beforeDestroy() {},
+};
+</script>
+<style lang="less" scoped></style>

develop/@gms/gms-plugin-billexpand/src/control/vxe-achievements/components/radioGroupControl.vue

 <template>
   <div class="">
     <RadioGroup v-model="attr.row[attr.field]">
-      <Radio label="新增项目"></Radio>
+      <Radio label="新增项目"></Radio>&nbsp;&nbsp;&nbsp;
       <Radio label="延续项目"></Radio>
     </RadioGroup>
   </div>

develop/@gms/gms-plugin-billexpand/src/control/vxe-achievements/components/textAreaControl.vue

+<template>
+  <div class="rbcInputControl">
+    <Input v-model="attr.row[attr.field]" type="textarea"/>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      
+    };
+  },
+  props: {
+    attr:{
+      type:Object,
+      default:()=>{}
+    }
+  },
+  watch: {},
+  computed: {},
+  methods: {
+   
+  },
+  mounted() {},
+  created() {},
+  beforeDestroy() {},
+};
+</script>
+<style lang="less" scoped>
+
+</style>

develop/@gms/gms-plugin-billexpand/src/control/vxe-achievements/components/vxe-table.vue

@@ -3,7 +3,7 @@
     <vxe-table
       border
       ref="detailXTable"
-      :data="attr.attr.tableData"
+      :data="detailData"
       :show-header="attr.attr.showHeader || false"
       :header-cell-class-name="headerCellClassName"
       :span-method="spanMethods"
@@ -21,18 +21,9 @@
         >
           <template slot-scope="scope">
             <component
-              v-if="
-                attr.attr.headerOne
-                  ? !attr.attr.headerOne.includes(scope.$rowIndex) &&
-                    column.type
-                  : column.type
-              "
               :is="column.type"
               :attr="{ field: column.field, row: scope.row, column: column }"
             ></component>
-            <span v-else style="display: inline-block; height: 38px">{{
-              scope.row[column.field]
-            }}</span>
           </template>
         </vxe-table-column>
       </template>
@@ -41,17 +32,19 @@
 </template>
 <script>
 import vxeAchievements from "../vxe-achievements.js";
-import dataControl from "./dataControl.vue";
+import dateControl from "./dateControl.vue";
 import vxeTableControl from "./vxe-table.vue";
 import radioGroupControl from "./radioGroupControl.vue";
 import inputControl from "./inputControl.vue";
+import textAreaControl from "./textAreaControl.vue";
 export default {
   mixins: [vxeAchievements],
   components: {
     vxeTableControl,
-    dataControl,
+    dateControl,
     radioGroupControl,
     inputControl,
+    textAreaControl
   },
   data() {
     return {
@@ -72,6 +65,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    detailData: {
+      type: Array,
+      default: () => {},
+    },
   },
   watch: {},
   computed: {},
@@ -106,10 +103,12 @@ export default {
       switch (menu.code) {
         case "addRow":
           detailXTable.insertAt(this.attr.attr.addObj,row);
+          this.$emit('dataChange',detailXTable.tableFullData);
           break;
         case "removeRow":
-          if(this.attr.attr.tableData.length>1){
-            detailXTable.remove(row)
+          if(detailXTable.tableFullData.length>1){
+            detailXTable.remove(row);
+            this.$emit('dataChange',detailXTable.tableFullData);
           }
           break;
         default:

develop/@gms/gms-plugin-billexpand/src/mcon.js

@@ -73,6 +73,8 @@ import throughQuery from "./query-actions/throughQuery";
 import queryDeleteBill from "./query-actions/queryDeleteBill";
 import openNewPageDetail from "./query-actions/openNewPageDetail";
 import DEQKD_batchEditorAction from "./query-actions/DEQKD_batchEditorAction";
+import GH_cfBalance from "./query-actions/labourUnion/gh_cfBalance.js"
+import GH_cfProject from "./query-actions/labourUnion/gh_cfProject.js"
 //control
 import applyDetail from './control/applyDetail';
 import linkShowDetail from './control/linkShowDetail';
@@ -214,11 +216,16 @@ export default {
         lincaoAddView,
         lincaoReadView,
         openNewPageDetail,
+<<<<<<< HEAD
         GH_agreeAction,
         GH_rejectAction,
         GH_submitAction,
         GH_retrieveAction,
         DEQKD_batchEditorAction
+=======
+        GH_cfBalance,
+        GH_cfProject
+>>>>>>> origin/develop
     },
     billAction: {
         printMultiAction,
@@ -262,6 +269,10 @@ export default {
         CW_imageView,
         saveActionBXD,
         CW_verifySignature,
+        GH_agreeAction,
+        GH_rejectAction,
+        GH_submitAction,
+        GH_retrieveAction,
     },
     billControl: {
         applyDetail,
@@ -378,5 +389,4 @@ export default {
     seniorQuery: {
         queryDate
     }
-}
-
+}
\ No newline at end of file

develop/@gms/gms-plugin-billexpand/src/query-actions/labourUnion/gh_cfBalance.js

+/*
+ * @Description:余额结转
+ */
+import axios from 'axios'
+export default {
+    execute(context, param) {
+        if (!param.billId || !param.billDefine) {
+            context.dom.$Message.info("请配置查询单据参数");
+            return;
+        }
+        if(context.selects.length==0){
+            context.dom.$Message.info("请勾择需要结转的数据");
+            return;
+        }
+        let billDefine = param.billDefine.replace(/_E/ig, "").replace(/_R/ig, "").replace(/_A/ig, "");
+        
+        this.generateVoucher(context.selects,billDefine,param.billId,context);
+    },
+    generateVoucher(list,billDefine,billId,context){
+        axios({
+              method: 'POST',
+              url:GMS.url+'/rbczgh/carryForward/balance',
+              headers: {
+                  Authorization:GMS.token,
+              },
+              data:{
+                jsonArry:list,
+                billDefine:billDefine,
+                billId:billId
+              }
+            }).then(res => {
+              if (res.status === 200) {
+                context.dom.$Modal.warning({
+                  title: '信息提示',
+                  content: res.data.data.processMsg,
+                  onOk: () => {},
+                });
+              }
+            })
+    },
+    
+}
\ No newline at end of file

develop/@gms/gms-plugin-billexpand/src/query-actions/labourUnion/gh_cfProject.js

+/*
+ * @Description:项目结转
+ */
+import axios from 'axios'
+export default {
+    execute(context, param) {
+        if (!param.billId || !param.billDefine) {
+            context.dom.$Message.info("请配置查询单据参数");
+            return;
+        }
+        if(context.selects.length==0){
+            context.dom.$Message.info("请勾择需要结转的数据");
+            return;
+        }
+        let billDefine = param.billDefine.replace(/_E/ig, "").replace(/_R/ig, "").replace(/_A/ig, "");
+        
+        this.generateVoucher(context.selects,billDefine,param.billId,context);
+    },
+    generateVoucher(list,billDefine,billId,context){
+        axios({
+              method: 'POST',
+              url:GMS.url+'/rbczgh/carryForward/project',
+              headers: {
+                  Authorization:GMS.token,
+              },
+              data:{
+                jsonArry:list,
+                billDefine:billDefine,
+                billId:billId
+              }
+            }).then(res => {
+              if (res.status === 200) {
+                context.dom.$Modal.warning({
+                  title: '信息提示',
+                  content: res.data.data.processMsg,
+                  onOk: () => {},
+                });
+              }
+            })
+    },
+    
+}
\ No newline at end of file