[finish]prod

src/api/base/customer.js

@@ -23,7 +23,7 @@ export default {
     },
 
     all(params) {
-        return fetch('/base/customer/all', params)
+        return fetch('/base/customer/list', params)
     },
 
     findList(params) {

src/api/contract/index.js

@@ -12,5 +12,9 @@ export default {
 
     page(params) {
         return fetch('/contract/page', params)
+    },
+
+    info(params){
+        return fetch('/contract/info/task', params)
     }
 }

src/views/project/components/attach/index.vue

@@ -31,7 +31,7 @@
                         </template>
                         <template #default> 上一级</template>
                     </a-button>
-                    <upload @ok="upload" v-if="pid !== '0'" />
+                    <upload @ok="upload" />
                     <add-folder
                         :project-id="this.projectId"
                         :query-id="queryId"
@@ -120,10 +120,13 @@ export default {
           default: 0
         },
         folder:{
-          required:true,
           type:String,
           default:''
-        }
+        },
+      uploadBtn:{
+          type:Boolean,
+        default:false
+      }
 
     },
     components: {
@@ -165,7 +168,11 @@ export default {
         }
     },
     mounted() {
-        this.fetchInit()
+        if (this.folder !== ""){
+          this.fetchInit()
+        } else {
+          this.fetchList()
+        }
     },
     methods: {
         goHome() {
@@ -181,6 +188,7 @@ export default {
                 this.fetchList()
             } else {
                 this.$notification.info('已经回到首页')
+
             }
         },
         fetchFolder(id) {
@@ -220,9 +228,10 @@ export default {
                 ...this.page
             }
             this.$api.projectFile.page(data).then(res => {
+              this.loading = false
                 if (res.code === 200) {
-                    this.list = res.data.records
+                      this.list = res.data.records
-                    this.page.total = res.data.total
+                      this.page.total = res.data.total
                 }
             })
         },

src/views/project/contract/components/edit-contract.vue

@@ -0,0 +1,357 @@
+<template>
+  <div>
+    <a-button type="primary" @click.stop="show = true"
+    >{{ info ? '编辑' : '新增合同' }}
+    </a-button>
+    <a-modal
+        v-model:visible="show"
+        width="960px"
+        title="新增合同"
+        title-align="start"
+        @close="reset"
+        @before-ok="submit"
+    >
+      <a-form auto-label-width :model="form" ref="form">
+        <a-row :gutter="16">
+          <a-col :span="24">
+            <a-form-item
+                label="合同名称"
+                field="name"
+                :rules="[
+                                { required: true, message: '请输入合同名称' }
+                            ]"
+            >
+              <a-input
+                  placeholder="请输入合同名称"
+                  v-model="form.name"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+
+        </a-row>
+        <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item
+                label="合同编号"
+                field="number"
+                :rules="[
+                                { required: true, message: '请输入合同编号' }
+                            ]"
+            >
+              <a-input
+                  placeholder="请输入合同编号"
+                  v-model="form.number"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item
+                field="type"
+                label="合同类型"
+                :rules="[
+                                { required: true, message: '请选择合同类型' }
+                            ]"
+            >
+              <a-select
+                  :options="contractOptions"
+                  allow-search
+                  @focus="handleContractSearch"
+                  placeholder="请选择合同负责人"
+                  v-model="form.type"
+              ></a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+
+
+
+        <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item
+                label="合同金额"
+                field="amount"
+                :rules="[
+                                { required: true, message: '请输入合同金额' }
+                            ]"
+            >
+              <a-input-number
+                  v-model="form.amount"
+                  placeholder="请输入合同金额"
+              ></a-input-number>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="签订时间" field="signDate">
+              <a-date-picker
+                  v-model="form.signDate"
+                  class="full-width"
+                  placeholder="请选择签订时间"
+              ></a-date-picker>
+            </a-form-item>
+          </a-col>
+        </a-row>
+
+        <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item label="合同开始日期" field="startDate">
+              <a-date-picker
+                  class="full-width"
+                  v-model="form.startDate"
+                  placeholder="请选择合同开始日期"
+              ></a-date-picker>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同结束日期" field="endDate">
+              <a-date-picker
+                  v-model="form.endDate"
+                  class="full-width"
+                  placeholder="请选择合同结束日期"
+              ></a-date-picker>
+            </a-form-item>
+          </a-col>
+        </a-row>
+
+        <a-row :gutter="16">
+
+          <a-col :span="12">
+            <a-form-item
+                label="对方签约单位"
+                field="customerId"
+                :rules="[
+                                { required: true, message: '请选择合同客户' }
+                            ]"
+            >
+              <a-select
+                  allow-search
+                  :options="customerOptions"
+                  @search="handleCustomer"
+                  v-model="form.customerId"
+                  placeholder="请选择合同客户"
+              ></a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item
+                label="对方签约负责人"
+                field="contact"
+            >
+              <a-select
+                  allow-search
+                  :options="customerContactsOptions"
+                  @search="handleContacts"
+                  v-model="form.contact"
+                  placeholder="请选择客户签约人"
+              ></a-select>
+            </a-form-item>
+          </a-col>
+
+        </a-row>
+        <a-row :gutter="16">
+            <a-col :span="12">
+              <a-form-item
+                  field="orgValue"
+                  label="我方签约单位"
+                  :rules="[
+                                { required: true, message: '请选择我方签约单位' }
+                            ]"
+              >
+                <a-select
+                    :options="companyOptions"
+                    allow-search
+                    @focusin="handleCompanyFocus"
+                    placeholder="请选择我方签约单位"
+                    v-model="form.orgValue"
+                ></a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="12">
+              <a-form-item
+                  field="person"
+                  label="我方签约负责人"
+                  :rules="[
+                                { required: true, message: '请选择合同负责人' }
+                            ]"
+              >
+                <a-select
+                    :options="userOptions"
+                    allow-search
+                    @search="handleSearch"
+                    @focusin="handleFocus"
+                    placeholder="请选择合同负责人"
+                    v-model="form.person"
+                ></a-select>
+              </a-form-item>
+            </a-col>
+        </a-row>
+        <a-row :gutter="16">
+          <a-col :span="24">
+            <a-form-item label="合同备注" field="remark">
+              <a-textarea
+                  v-model="form.remark"
+                  :auto-size="{ minRows: 5 }"
+                  placeholder="请输入合同备注"
+              ></a-textarea>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    projectId: {
+      required: true,
+      type: String,
+      default: ""
+    },
+    taskId :{
+      required: true,
+      type: String,
+      default: ""
+    }
+  },
+  watch: {
+    show: {
+      handler(val) {
+        if (val && this.info) {
+          this.form = { ...this.info }
+          this.handleSearch(this.form.person.name)
+          this.form.person = this.form.person.id
+          this.handleCustomer(this.form.customer.name)
+          this.form.customerId = this.form.customer.id
+          if (this.form.signatory) {
+            this.handleSign(this.form.signatory.name)
+            this.form.signatory = this.form.signatory.id
+          }
+          if (this.form.customerContact) {
+            this.handleContacts(this.form.customerContact.name)
+            this.form.customerContactId =
+                this.form.customerContact.id
+          }
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      show: false,
+      form: {
+        projectId:'',
+        name:'',
+        number:'',
+        amount:0,
+        type :'0',
+        customerId:'',
+        contact:'',
+        orgValue:'',
+        person:'',
+        remark:'',
+        signDate:'',
+        startDate:'',
+        endDate:'',
+        taskIds:''
+      },
+      userOptions: [],
+      signOptions: [],
+      contractOptions: [],
+      customerOptions: [],
+      customerContactsOptions: [],
+      companyOptions:[]
+    }
+  },
+  methods: {
+    // 获取负责人
+    handleSearch(value) {
+      this.$api.user.list({ name: value }).then(res => {
+        if (res.code === 200) {
+          this.userOptions = res.data.map(e => {
+            return { label: e.name, value: e.id }
+          })
+        }
+      })
+    },
+
+    handleSign(value) {
+      this.$api.user.list({ name: value }).then(res => {
+        if (res.code === 200) {
+          this.signOptions = res.data.map(e => {
+            return { label: e.name, value: e.id }
+          })
+        }
+      })
+    },
+    handleContractSearch(){
+      this.$api.sys.dict({code:'contract_type'}).then(res => {
+        if (res.code === 200){
+          this.contractOptions = res.data.map(e => {
+            return { label: e.label, value: e.value }
+          })
+        }
+      })
+    },
+    handleCompanyFocus(){
+      this.$api.sys.dict({code:'contract_sign_company'}).then(res => {
+        if (res.code === 200){
+          this.companyOptions = res.data.map(e => {
+            return { label: e.label, value: e.value }
+          })
+        }
+      })
+    },
+    handleContacts(value) {
+      this.$api.contacts
+          .list({ name: value, customerId: this.form.customerId })
+          .then(res => {
+            if (res.code === 200) {
+              this.customerContactsOptions = res.data.map(item => {
+                return { label: item.name, value: item.id }
+              })
+            }
+          })
+    },
+    handleCustomer(value) {
+      this.$api.customer.all({ name: value }).then(res => {
+        if (res.code === 200) {
+          this.customerOptions = res.data.map(e => {
+            return { label: e.name, value: e.id }
+          })
+        }
+      })
+    },
+    handleFocus() {
+      this.handleSearch('')
+    },
+    reset() {
+      if (!this.form.id) {
+        this.$refs.form.resetFields()
+      }
+    },
+    submit(done) {
+      this.$refs.form.validate(errors => {
+        if (errors === undefined) {
+          this.form.projectId = this.projectId
+          this.form.taskIds = [this.taskId]
+          this.$api.contract.submit(this.form).then(res => {
+            if (res.code === 200) {
+              this.$notification.success(res.msg)
+              this.$emit('ok', res.data)
+              done()
+            } else {
+              this.$notification.error(res.msg)
+              done(false)
+            }
+          })
+        } else {
+          done(false)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/project/contract/index.vue

@@ -0,0 +1,154 @@
+<template>
+    <div>
+        <div>
+            <a-button-group type="outline">
+                <add-contract :project-id="projectId" :task-id="taskId" @ok="fetchInfo"/>
+                <a-button>关联合同</a-button>
+            </a-button-group>
+        </div>
+        <a-card class="mt-20">
+            <a-descriptions
+                v-if="info"
+                :data="data"
+                :title="info.name"
+                bordered
+            />
+            <a-empty v-else description="暂无合同">
+
+            </a-empty>
+        </a-card>
+        <div>
+            <a-tabs class="mt-10" @change="tabChange" :active-key="tabIndex">
+                <a-tab-pane title="合同附件" key="0"></a-tab-pane>
+                <a-tab-pane title="合同回款" key="1"></a-tab-pane>
+            </a-tabs>
+        </div>
+
+        <div v-if="tabIndex === 0 && info">
+            <attach :type="2" :query-id="info.id" :project-id="info.projectId"/>
+        </div>
+          <a-empty v-else description="暂无数据">
+
+          </a-empty>
+    </div>
+</template>
+
+<script>
+import EditContract from '@/views/project/contract/components/edit-contract.vue'
+import attach from "@/views/project/components/attach/index.vue";
+
+export default {
+    components: {
+        addContract: EditContract,attach
+    },
+    props: {
+        projectId: {
+            required: true,
+            type: String,
+            default: ''
+        },
+        taskId: {
+            required: true,
+            type: String,
+            default: ''
+        }
+    },
+    watch: {
+        tabIndex: {
+            handler(val) {
+                if (val === 0) {
+                    this.fetchInfo()
+                }
+            }
+        }
+    },
+    data() {
+        return {
+            tabIndex: 0,
+            info: null,
+            data: [
+                {
+                    label: '合同编号',
+                    prop: 'number'
+                },
+                {
+                    label: '合同类型',
+                    prop: 'number'
+                },
+                {
+                    label: '合同金额',
+                    prop: 'amount'
+                },
+                {
+                    label: '签订时间',
+                    prop: 'signDate'
+                },
+                {
+                    label: '合同开始日期',
+                    prop: 'startDate'
+                },
+                {
+                    label: '合同结束日期',
+                    prop: 'endDate'
+                },
+
+                {
+                    label: '对方单位名称',
+                    prop: 'customer'
+                },
+                {
+                    label: '对方单位联系人',
+                  prop: 'contact'
+                },
+                {
+                    label: '我方单位名称',
+                    prop: 'org'
+                },
+                {
+                    label: '我方负责联系人',
+                    prop: 'person'
+                },
+                {
+                    label: '备注',
+                    prop: 'remark'
+                }
+            ]
+        }
+    },
+    mounted() {
+        this.fetchInfo()
+    },
+    methods: {
+        fetchInfo() {
+            this.$api.contract.info({ taskId: this.taskId }).then(res => {
+                if (res.code === 200) {
+                    this.info = res.data
+                    this.fetchData()
+                }
+            })
+        },
+        fetchData() {
+            this.data = this.data.map(e => {
+                const item = e
+                item.value = this.info[e.prop]
+              if (e.prop === "person"){
+                item.value = this.info.personInfo.name
+              }
+              if (e.prop === "org"){
+                item.value = this.info.org.label
+              }
+              if (e.prop === "customer"){
+                item.value = this.info.customer.name
+              }
+              if (e.prop === "contact"){
+                item.value = this.info.contact.name
+              }
+                return item
+            })
+        },
+        tabChange(res) {}
+    }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/project/index/index.vue

@@ -21,14 +21,24 @@
                         </a-tag>
                       </div>
                     </div>
-
                   </div>
                   <div  class="flex flex-center flex-justify-between">
+
                     <div>
                       <edit-project @ok="fetchList"/>
                     </div>
                   </div>
                 </div>
+                <div>
+
+                </div>
+              <div class="flex flex-center flex-justify-between">
+                <div class="flex flex-center" >
+                  <a-input placeholder="请输入项目名称"  v-model="name" allow-clear> </a-input>
+                  <a-button type="primary" class="ml-20" @click="fetchList"> 搜索</a-button>
+                </div>
+                <div></div>
+              </div>
                 <a-table
                     :columns="columns"
                     :data="list"

src/views/project/task/task-info.vue

@@ -52,6 +52,9 @@
                       <div v-if="tabIndex === 0">
                         <attach :project-id="task.projectId" :query-id="task.id" :type="1" folder="project_task_folder_init"/>
                       </div>
+                      <div v-else-if="tabIndex === 1">
+                          <contract :project-id="task.projectId" :task-id="task.id" />
+                      </div>
                     </div>
                     <div style="flex: 1" class="ml-20">
                         <a-card>
@@ -103,12 +106,14 @@
 import filePicker from '@/views/project/components/file-picker/index.vue'
 import preview from '@/components/preview/index.vue'
 import attach from "@/views/project/components/attach/index.vue";
+import contract from "@/views/project/contract/index.vue"
 
 export default {
     components: {
         filePicker,
         preview,
-      attach
+      attach,
+      contract
     },
     props: {
         id: {