up

src/views/contract/components/contractSign.vue

@@ -325,6 +325,7 @@
     methods: {
       //合同签订
       sign() {
+
         editorContract({
           id: this.contractId,
           number: this.form.number,
@@ -359,8 +360,11 @@
           id: this.contractId
         })
         this.contract = res;
-        Object.assign(this.form, res)
+        Object.assign(this.form, res);
+        if (res.start_date && res.end_date)
           this.form.time = [res.start_date, res.end_date];
+        else
+          this.form.time = [];
         this.form.carryDepartment = res.carry_department;
         this.form.guaranteeMoney = res.guarantee_money;
         this.form.guaranteeYear = res.guarantee_year;
@@ -401,7 +405,8 @@
       async getOaContractInfo() {
         try {
           let res = await getOatoken()
-          let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/view/${this.contract.join_last_flow_id}?oatoken=${res.oatoken}&get_raw=1`
+          let url =
+            `${process.env.VUE_APP_OUT_URL}/admin/flow/view/${this.contract.join_last_flow_id}?oatoken=${res.oatoken}&get_raw=1`
           const oaInfo = await axios.get(url)
           this.form.money = Number(oaInfo.data.flow['合同金额（元）'])
           this.form.number = oaInfo.data.flow['合同编号']

src/views/contract/contractList.vue

@@ -677,7 +677,9 @@
               customFn: (row) => {
                 {
                   return row.plans.map(item => {
-                      return ( < div > [{item.year}] - {
+                      return ( < div > [{
+                          item.year
+                        }] - {
                           item.name
                         } < /div>)
                       })
@@ -829,10 +831,18 @@
                 prop: 'name',
                 align: 'left'
               },
+              
               {
                 label: "计划金额",
                 prop: 'money',
-                align: 'right'
+                align: 'right',
+                width: 120,
+                customFn: (row) => {
+                  let m1 = row.money;
+                  let m2 = row.update_money;
+
+                  return m2 == 0 ? m1 : m2;
+                }
               }
             ],
             planTable: [{
@@ -876,7 +886,13 @@
                 label: "计划金额",
                 prop: 'money',
                 align: 'right',
-                width: 120
+                width: 120,
+                customFn: (row) => {
+                  let m1 = row.money;
+                  let m2 = row.update_money;
+
+                  return m2 == 0 ? m1 : m2;
+                }
               }
             ],
 
@@ -965,7 +981,8 @@
               row.useMoney = 0
               return
             }
-            if (e <= (Number(row.money) - Number(row.use_money_total))) {
+            let money = Number(row.update_money) == 0 ? Number(row.money) : Number(row.update_money);
+            if (e <= (money - Number(row.use_money_total))) {
               row.useMoney = e
               this.plan.forEach(item => {
                 if (item.value.plan_id == row.id) {

src/views/dashboard/index.vue

@@ -65,11 +65,10 @@
         <Page :total="total" show-elevator @on-change="pageChange" />
       </div>
     </div>
-
-
-
-    <el-row :gutter="20">
-      <el-col :span="12" :xs="24">
+    <div class="demo-split">
+      <Split v-model="split" style="height: 440px;">
+        <template #left>
+          <div class="demo-split-pane" style="padding-right: 5px;">
             <div ref="lxHeader" v-if="statistic.departmentList">
               <LxHeader icon="md-apps" text="科室进展情况" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
                 <div slot="content" />
@@ -90,8 +89,10 @@
                 </slot>
               </LxHeader>
             </div>
-      </el-col>
-      <el-col :span="12" :xs="24">
+          </div>
+        </template>
+        <template #right>
+          <div class="demo-split-pane" style="padding-left: 10px;">
             <div ref="lxHeader" v-if="statistic.typeList">
               <LxHeader icon="md-apps" text="预算类型进展情况" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
                 <div slot="content" />
@@ -101,7 +102,8 @@
                       <template v-slot:btns>
                         <el-table-column :width="80" fixed="right" label="操作" header-align="center" align="center">
                           <template slot-scope="scope">
-                        <router-link :to="`/statisticalReport/budgetProgress?typeId=${scope.row.type}`">查看</router-link>
+                            <router-link :to="`/statisticalReport/budgetProgress?typeId=${scope.row.type}`">查看
+                            </router-link>
                           </template>
                         </el-table-column>
                       </template>
@@ -110,9 +112,12 @@
                 </slot>
               </LxHeader>
             </div>
-      </el-col>
-    </el-row>
+          </div>
+        </template>
+      </Split>
+
 
+    </div>
 
     <detailContract ref="detailContract"></detailContract>
   </div>
@@ -150,6 +155,8 @@
     },
     data() {
       return {
+        value2: 12,
+        split: 0.5,
         select: {
           year: ''
         },
@@ -184,8 +191,8 @@
           {
             label: '进展情况',
             sortable: false,
+            minWidth: 220,
             align: 'left',
-            width: 320,
             fixed: "right",
             customFn: (row) => {
               let m2 = row.money_total_2;
@@ -473,6 +480,7 @@
   }
 </style>
 <style lang="scss" scoped>
+
   .ivu-btn {
     margin-right: 10px;
   }

src/views/finance/components/examineRegistration.vue

@@ -308,7 +308,13 @@
             label: "计划金额",
             prop: 'money',
             width: 136,
-            align: 'right'
+            align: 'right',
+            customFn: (row) => {
+              let m1 = row.money;
+              let m2 = row.update_money;
+
+              return m2 == 0 ? m1 : m2;
+            }
           }
         ],
       }
@@ -497,14 +503,20 @@
             }
           });
           //说明被删除了
-          if(sel.filter(plan=>{ return plan.id==row.id}).length==0){
-             this.delPlan({plan_id:row.id})
+          if (sel.filter(plan => {
+              return plan.id == row.id
+            }).length == 0) {
+            this.delPlan({
+              plan_id: row.id
+            })
           }
           let _plan = JSON.parse(JSON.stringify(this.paymentRegistrationForm.plan));
 
           var _select = [];
           select.map(item => {
-             if(_plan.filter(plan=>{ return plan.plan_id==item.plan_id}).length==0){
+            if (_plan.filter(plan => {
+                return plan.plan_id == item.plan_id
+              }).length == 0) {
               _select.push(item)
             }
           });

src/views/system/user.vue

@@ -141,22 +141,12 @@
               required: true,
               message: '请输入姓名',
               trigger: 'blur'
-            },
-            {
-              min: 3,
-              message: '长度至少3位',
-              trigger: 'blur'
             }
           ],
           username: [{
               required: true,
               message: '请输入用户名',
               trigger: 'blur'
-            },
-            {
-              min: 3,
-              message: '长度至少三位',
-              trigger: 'blur'
             }
           ],
           password: [{