Explorar o código

Merge remote-tracking branch 'origin/master'

hotchicken1996 hai 1 ano
pai
achega
f5a9456629

+ 1 - 1
client/src/views/OaSystem/projectCenter/projectBook/deptProject.vue

@@ -119,7 +119,7 @@
           <el-table-column prop="xmjl" label="项目经理" />
           <el-table-column prop="lxsj" label="立项时间" />
           <el-table-column prop="yssj" label="验收时间" />
-          <el-table-column prop="outputValue" label="总产值" />
+          <el-table-column prop="outputValue" label="合同额" />
           <el-table-column prop="xmzt" label="项目状态">
             <template #default="scope">
               {{ xmztMap[scope.row.xmzt] }}

+ 1 - 1
client/src/views/OaSystem/projectCenter/projectBook/myProject.vue

@@ -113,7 +113,7 @@
           <el-table-column prop="xmjl" label="项目经理" />
           <el-table-column prop="lxsj" label="立项时间" />
           <el-table-column prop="yssj" label="验收时间" />
-          <el-table-column prop="outputValue" label="总产值" />
+          <el-table-column prop="outputValue" label="合同额" />
           <el-table-column prop="xmzt" label="项目状态">
             <template #default="scope">
               {{ xmztMap[scope.row.xmzt] }}

+ 1 - 1
client/src/views/OaSystem/projectCenter/projectBook/projectBook.vue

@@ -113,7 +113,7 @@
           <el-table-column prop="xmjl" label="项目经理" />
           <el-table-column prop="lxsj" label="立项时间" />
           <el-table-column prop="yssj" label="验收时间" />
-          <el-table-column prop="outputValue" label="总产值" />
+          <el-table-column prop="outputValue" label="合同额" />
           <el-table-column prop="xmzt" label="项目状态">
             <template #default="scope">
               {{ xmztMap[scope.row.xmzt] }}

+ 2 - 1
zjugis-business/src/main/resources/mapper/oracle/ProjectMapper.xml

@@ -22,7 +22,8 @@
     </select>
 
     <select id="page" resultType="com.zjugis.business.bean.entity.Project">
-        SELECT * FROM PROJECT P
+        SELECT *,C.CONTRACT_AMOUNT as outputValue FROM PROJECT P
+        LEFT JOIN CONTRACT C ON C.PROJECT_ID = P.ID
         <if test="params != null and params.userId != null  and params.userId != ''">
             LEFT JOIN PROJECT_WORKER_RELATION PW ON PW.PROJECT_ID = P.ID
         </if>

+ 40 - 0
zjugis-business/src/main/resources/templates/FlowContract/js/apply.js

@@ -10,6 +10,7 @@
         initData();
         initCalcTax();
         initContractMilestone();
+        // bindGenerateSerial();
         z.workflow.saveBtn.addListener("onSaveClick", submit);
     }
 
@@ -19,6 +20,45 @@
         initAreaManager();
     }
 
+    function bindGenerateSerial(){
+        $("#generateSerial").on("click",function(){
+            var zrbmId = $("[name='contract$zrbmId']").val();
+            if(!zrbmId){
+                z.ui.alertWarning("请选择责任部门!");
+                return;
+            }
+            var genFlag = true;
+            var xmbh = $("[name='project$xmbh'] input").val();
+            if(xmbh) {
+                z.ui.confirm("confirm").init({
+                    content: '已有编号[' +xmbh + '],重新生成会覆盖原有编号,是否继续?',
+                    onCancel: function () {
+                        genFlag = false;
+                    }
+                })
+            }
+            var postdata = {"name": '合同签订',
+                "deptId": zrbmId}
+            if(genFlag){
+                z.ui.ajax({
+                    type: "post",
+                    contentType: "application/json",
+                    url: "/common/generate-serial-number",
+                    data: JSON.stringify(postdata),
+                    success: function (res) {
+                        if(res && res.code === 0){
+                            $("[name='project$xmbh'] input").val(res.data)
+                        } else {
+                            z.ui.alertWarning(res.msg);
+                        }
+                    },
+                    error: function () {
+                    }
+                })
+            }
+        })
+    }
+
     function initClient(){
         z.ui.ajax({
             type: "get",