用户服务商+上传合同

src/views/hlguser/HlgUserList.vue

@@ -25,6 +25,17 @@
             </a-col>
 
 
+            <template v-if="toggleSearchStatus">
+              <a-col :md="6" :sm="8">
+                <a-form-item label="用户合同">
+                  <j-dict-select-tag v-model="queryParam.contractUpload" placeholder="请选择"
+                                     dictCode="contract_upload"></j-dict-select-tag>
+                </a-form-item>
+              </a-col>
+            </template>
+
+
+
             <a-col :md="6" :sm="8">
               <a-form-item label="最后付款企业">
                 <a-input placeholder="请输入最后付款企业" v-model="queryParam.lastPaymentCompany"></a-input>

src/views/hlguser/modules/HlgUserSubcontractor.vue

@@ -39,16 +39,11 @@
             </span>
 
             <span slot="action1" slot-scope="text, record">
-              <template v-if="record.subcontract">
-              <a style="color:#000c17">已上传
-                <a-icon type="upload" :style="{color:'#8e8e8e'}" title="点击上传" @click="uploadContract(record)" style="margin-left: 8px" />
-              </a>
-              </template>
-              <template v-if="!record.subcontract">
-               <a style="color:#000c17">未上传
+
+               <span>{{record.workContract ? '已上传':'未上传'}}</span>
+                <span>{{record.isPayment ? '':'  (未走款)'}}</span>
                 <a-icon type="upload" :style="{color:'#8e8e8e'}" title="点击上传" @click="uploadContract(record)" style="margin-left: 8px" />
-               </a>
-              </template>
+
             </span>
 
           </a-table>
@@ -117,7 +112,7 @@
           {
             title: '用户合同',
             align: 'left',
-            dataIndex: 'subcontract',
+            dataIndex: 'workContract',
             scopedSlots: { customRender: 'action1' }
           },
           // {
@@ -196,7 +191,7 @@
         recordNew.id = record.userContractId;
         recordNew.userId = this.userId;
         recordNew.subcontractorId = record.id;
-        recordNew.subcontract = record.subcontract;
+        recordNew.subcontract = record.workContract;
         this.$refs.contractModal.edit(recordNew)
         this.$refs.contractModal.title = '用户合同'
         this.$refs.contractModal.disableSubmit = false