待缴费

src/dashoo.cn/backend/api/controllers/oilsupplier/paymentinfo.go

@@ -43,7 +43,11 @@ func (this *PaymentInfoController) GetEntityList() {
 	IsPay := this.GetString("IsPay")
 
 	if IsPay != "" {
-		where = where + " and p.IsPay = '" + IsPay + "'"
+		if IsPay == "0" {
+			where = where + " and (p.IsPay = '" + IsPay + "' or p.IsPay = '1') "
+		} else {
+			where = where + " and p.IsPay = '" + IsPay + "'"
+		}
 	}
 
 	if SupplierTypeCode != "" {

src/dashoo.cn/backend/api/controllers/oilsupplier/todolist.go

@@ -412,7 +412,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 	orderby := "Id"
 	asc := false
 	Order := this.GetString("Order")
-	where = where + " and b.Status>0"
+	//where = where + " and b.Status>0"
 	Prop := this.GetString("Prop")
 	if Order != "" && Prop != "" {
 		orderby = Prop

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/_opera/operation.vue

@@ -11,7 +11,7 @@
         </span>
         <span style="float: right;">
           <el-button type="primary" size="mini" style="margin-right: 15px" @click="printBtn" v-if="formData.IsPay == '1'">打印</el-button>
-          <el-button type="primary" size="mini" style="margin-right: 15px" @click="submitPay" v-if="formData.IsPay == '1'">提交缴费</el-button>
+          <!--<el-button type="primary" size="mini" style="margin-right: 15px" @click="submitPay" v-if="formData.IsPay == '1'">提交缴费</el-button>-->
           <router-link :to="'/oilsupplier/paymentinfo'">
             <el-button type="primary" size="mini">返回</el-button>
           </router-link>
@@ -31,7 +31,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="缴费金额">
-              <el-input v-model="formData.Amount" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay != '0'" ></el-input>
+              <el-input v-model="formData.Amount" placeholder="请输入" style="width: 100%" :disabled="formData.IsPay != '0' || authUser.Profile.IsCompanyUser==1 " ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -79,7 +79,7 @@
           </el-col>
         </el-row>
         <el-form-item :span="24" style="text-align: center;">
-          <el-button type="primary" size="small" @click="updateEntity" v-if="formData.IsPay == '0'"><i class="el-icon-circle-check"></i>保存</el-button>
+          <el-button type="primary" size="small" @click="updateEntity" v-if="formData.IsPay == '0' && authUser.Profile.IsCompanyUser!=1 "><i class="el-icon-circle-check"></i>保存</el-button>
         </el-form-item>
       </el-form>
     </el-card>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/index.vue

@@ -40,7 +40,7 @@
         <el-table-column label="操作" min-width="180" align="center" fixed="right">
           <template slot-scope="scope">
             <router-link :to="'/oilsupplier/paymentinfo/' + scope.row.Id + '/operation'">
-              <el-button type="primary" plain title="查看详情" size="mini">缴费</el-button>
+              <el-button type="primary" plain title="查看详情" size="mini">查看</el-button>
             </router-link>
             <!-- <el-popover placement="top" title="提示">
               <el-alert