前端gjy

src/views/contractManagement/purchaseContract.vue

@@ -101,10 +101,8 @@
             visible-arrow="false"
             @show="history(scope.row)"
           >
-            <template #reference>
-              <span @show="history(scope.row)" slot="reference">{{
-                scope.row.status
-              }}</span>
+            <template>
+              <span slot="reference">{{ scope.row.status }}</span>
             </template>
             <div>
               <p>操作历史</p>
@@ -150,28 +148,34 @@
         </template>
       </el-table-column>
     </el-table>
-
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="deptBudgetTotal"
+    >
+    </el-pagination>
     <!-- 附件弹框 -->
-    <!-- <WinseaContentModal
+    <WinseaContentModal
       v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose"
     >
+      <p>查看附件</p>
       <ws-upload
-        ref="uploads"
-        table-name="ism_circular_management_info "
-        :vesselId="my_vesselId ? my_vesselId : ''"
-        oss-key="circularLetter"
-        :editable="false"
-        :appendix-ids="appendixIdss"
+        ref="upload"
+        table-name="maintain_work_order"
+        oss-key="mainPlan"
         :comp-id="compId"
+        :appendix-ids="appendixIdsAdd"
+        :vesselId="deptBudgetList.addressUrl"
+        :size-limit="size"
+        @uploadSuccess="uploadSuccess"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
-      <template slot="footer" class="dialog-footer">
-        <ws-button @click="hiddenHistory">{{
-          $t('crew.interviewManagement.button.cancel')
-        }}</ws-button>
-      </template>
-    </WinseaContentModal> -->
+    </WinseaContentModal>
   </div>
 </template>
 <script>
@@ -182,9 +186,15 @@ import {
   billoperatehis,
 } from '@/model/contarct/index'
 import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
   watch: {
     vesselId(val) {
       this.getList()
@@ -202,12 +212,15 @@ export default {
       monetaryKey: null,
       // 表格显示数据
       tableDate: [],
+      size: 10,
       // 是否显示
       showType: true,
       // 年
       year: '',
+      deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
+      appendixIdsAdd: '',
       searchType: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
@@ -216,6 +229,7 @@ export default {
       endDate: null,
       // 提交类型
       submitType: true,
+      deptCircularPage: {},
       date: {
         year: dayjs().format('YYYY'),
         month: dayjs().format('MM'),
@@ -223,6 +237,7 @@ export default {
       contractList: [],
       deptBudgetList: {},
       historyList: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -245,6 +260,17 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
     getList() {
       getList({
         compId: sessionStorage.getItem('ws-pf_compId'),
@@ -259,9 +285,23 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
           this.contractList = response
         })
     },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+
+      // this.deptBudgetList.
+      // this.formData.append('files', files)
+      // this.feedbackObj.uploadNameAttachment = data.appendixName
+      // this.feedbackObj.pathUploadAttachment = data.appendixPath
+      // // this.newAppendixs = files
+      // this.onChangeFlag = true
+    },
     editClick(row) {
       var status = ''
       if (row.status == '待执行' || row.status == '已完成') {
@@ -299,7 +339,7 @@ export default {
         }
       }
     },
-    fujian() {
+    fujian(row) {
       if (
         row.receiveAttachmentPath === null ||
         row.receiveAttachmentPath === ''
@@ -387,7 +427,11 @@ export default {
   // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
   // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
 }
-
+.el-pagination {
+  padding: 10px 15px;
+  margin-bottom: 0;
+  text-align: right;
+}
 .vertical-circle {
   float: left;
   width: 10px;

src/views/contractManagement/salesContractEdit.vue

@@ -50,7 +50,7 @@
           </ws-form-item>
 
           <!--买方-->
-           <ws-form-item label="买方" span="1" prop="contractNo">
+          <ws-form-item label="买方" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.buyer"
               maxlength="100"
@@ -205,7 +205,7 @@
             </el-select>
           </ws-form-item>
 
-         <!--溢短装（%）-->
+          <!--溢短装（%）-->
           <ws-form-item label="溢短装（%））" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.overShort"
@@ -253,7 +253,7 @@
             />
           </ws-form-item>
 
-           <!--合同总价-->
+          <!--合同总价-->
           <ws-form-item label="合同总价" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.totalContractPrice"
@@ -261,7 +261,7 @@
               size="small"
             />
           </ws-form-item>
-           <!--签订日期-->
+          <!--签订日期-->
           <ws-form-item label="签订日期" span="1" prop="signingDate">
             <ws-date-picker
               :picker-options="pickerBeginDateBefore"
@@ -273,236 +273,204 @@
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
-         </ws-info-table>
-         </ws-form>
-          <!-- <base-card> -->
-          <div class="wenzi">
-            <h3>货物信息</h3>
-          </div>
-          <div class="center">
-             <ws-form
-        ref="deptBudgetList"
-        :rules="ruleDeptBudget"
-        :model="deptBudgetList"
-      >
+        </ws-info-table>
+      </ws-form>
+      <!-- <base-card> -->
+      <div class="wenzi">
+        <h3>货物信息</h3>
+      </div>
+      <div class="center">
+        <ws-form
+          ref="deptBudgetList"
+          :rules="ruleDeptBudget"
+          :model="deptBudgetList"
+        >
           <!--货物信息-->
           <ws-info-table>
             <!--货名-->
-          <ws-form-item label="货名" span="1" prop="goodsName">
-            <ws-select
-              v-model="deptBudgetList.contractGoodsInfo.goodsName"
-              placeholder=""
-              class="typeselect"
-              @change="selectpackingMethod"
-            >
-              <ws-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
-            <span class="unchangeable">*</span>
-          </ws-form-item>
+            <ws-form-item label="货名" span="1" prop="goodsName">
+              <ws-select
+                v-model="deptBudgetList.contractGoodsInfo.goodsName"
+                placeholder=""
+                class="typeselect"
+                @change="selectpackingMethod"
+              >
+                <ws-option
+                  v-for="item in goodnameList"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
+              <span class="unchangeable">*</span>
+            </ws-form-item>
 
             <!--水分（%）<=-->
-          <ws-form-item label="水分（%）" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractGoodsInfo.waterContent"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-
-          <!--品级-->
-          <ws-form-item label="品级" span="1" prop="grade">
-            <ws-select
-              v-model="deptBudgetList.contractGoodsInfo.grade"
-              placeholder=""
-              class="typeselect"
-              @change="selectgrade"
-            >
-              <ws-option
-                v-for="item in gradeList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
+            <ws-form-item label="水分（%）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractGoodsInfo.waterContent"
+                maxlength="100"
+                size="small"
               />
-            </ws-select>
-          </ws-form-item>
-
-             <!--杂质（%）<=-->
-          <ws-form-item label="杂质（%）" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractGoodsInfo.impurity"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-
-          <!--容量（克/升）>=-->
-          <ws-form-item label="容量（克/升）" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-
-          <!--霉变粒（%）<=-->
-          <ws-form-item label="霉变粒（%）" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-
-          <!--热损伤（%）<=-->
-          <ws-form-item label="热损伤（%）" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
+            </ws-form-item>
+
+            <!--品级-->
+            <ws-form-item label="品级" span="1" prop="grade">
+              <ws-select
+                v-model="deptBudgetList.contractGoodsInfo.grade"
+                placeholder=""
+                class="typeselect"
+                @change="selectgrade"
+              >
+                <ws-option
+                  v-for="item in gradeList"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
+            </ws-form-item>
+
+            <!--杂质（%）<=-->
+            <ws-form-item label="杂质（%）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractGoodsInfo.impurity"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+
+            <!--容量（克/升）>=-->
+            <ws-form-item label="容量（克/升）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+
+            <!--霉变粒（%）<=-->
+            <ws-form-item label="霉变粒（%）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+
+            <!--热损伤（%）<=-->
+            <ws-form-item label="热损伤（%）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
             <!--不完整粒（%）<=-->
-              <ws-form-item label="不完整粒（%）" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
+            <ws-form-item label="不完整粒（%）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
           </ws-info-table>
- </ws-form>
-    </div>
-          <div class="wenzi">
-            <h3>流程信息</h3>
-          </div>
- <div class="center">
-      <ws-form
-        ref="deptBudgetList"
-        :rules="ruleDeptBudget"
-        :model="deptBudgetList"
-      >
+        </ws-form>
+      </div>
+      <div class="wenzi">
+        <h3>流程信息</h3>
+      </div>
+      <div class="center">
+        <ws-form
+          ref="deptBudgetList"
+          :rules="ruleDeptBudget"
+          :model="deptBudgetList"
+        >
           <!--流程信息-->
 
           <ws-info-table>
             <!--合同收入（元）-->
-          <ws-form-item label="合同收入（元）" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-
-          <!--已开发票（元）-->
-          <ws-form-item label="已开发票（元）" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractProcessInfo.goodsName"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
+            <ws-form-item label="合同收入（元）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+
+            <!--已开发票（元）-->
+            <ws-form-item label="已开发票（元）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractProcessInfo.goodsName"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
 
             <!--费用支出（元）-->
-          <ws-form-item label="费用支出（元）" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractProcessInfo.waterContent"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-
-          <!--未开发票（元）-->
-          <ws-form-item label="未开发票（元）" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractProcessInfo.impurity"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
+            <ws-form-item label="费用支出（元）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractProcessInfo.waterContent"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+
+            <!--未开发票（元）-->
+            <ws-form-item label="未开发票（元）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractProcessInfo.impurity"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
             <!--未回款（元）-->
-          <ws-form-item label="未回款（元）" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractProcessInfo.mildewGrain"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-
-          <!--已完成发货量（吨）-->
-          <ws-form-item label="已完成发货量（吨）" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-            <!--双章原件回收情况-->
-          <ws-form-item label="双章原件回收情况" span="1" prop="grade">
-            <ws-select
-              v-model="deptBudgetList.contractProcessInfo.grade"
-              placeholder=""
-              class="typeselect"
-              @change="selectpackingMethod"
-            >
-              <ws-option
-                v-for="item in ChapterTwoList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
+            <ws-form-item label="未回款（元）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractProcessInfo.mildewGrain"
+                maxlength="100"
+                size="small"
               />
-            </ws-select>
-          </ws-form-item>
+            </ws-form-item>
+
+            <!--已完成发货量（吨）-->
+            <ws-form-item label="已完成发货量（吨）" span="1" prop="contractNo">
+              <ws-input
+                v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+            <!--双章原件回收情况-->
+            <ws-form-item label="双章原件回收情况" span="1" prop="grade">
+              <ws-select
+                v-model="deptBudgetList.contractProcessInfo.grade"
+                placeholder=""
+                class="typeselect"
+                @change="selectpackingMethod"
+              >
+                <ws-option
+                  v-for="item in ChapterTwoList"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
+            </ws-form-item>
           </ws-info-table>
-<<<<<<< HEAD
-  
-      </ws-form>
-    </div>
+        </ws-form>
+      </div>
 
-           <div class="wenzi">
-          <h3>备注信息</h3>
-        </div>
-        <div class="ce">
-      <ws-form
-        ref="deptBudgetList"
-        :rules="ruleDeptBudget"
-        :model="deptBudgetList"
-      >
-            <!--备注信息-->
-        <ws-input
-          v-model="deptBudgetList.remarks"
-          type="textarea"
-          row="3"
-          placeholder="请输入备注信息，不超过200字"
-          maxlength="200"
-        />
-        <ws-upload
-          ref="upload"
-          table-name="maintain_work_order"
-          oss-key="mainPlan"
-          :comp-id="compId"
-          :appendix-ids="appendixIdsAdd"
-          :vesselId="deptBudgetList.addressUrl"
-          :size-limit="size"
-          @uploadSuccess="uploadSuccess"
-          @onChange="onChange"
-          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-        />
-      </ws-form>
-        </div>
-      <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
-        >提交</el-button
-      >
-    </div>
-=======
-          <div class="wenzi">
-            <h3>备注信息</h3>
-          </div>
+      <div class="wenzi">
+        <h3>备注信息</h3>
+      </div>
+      <div class="ce">
+        <ws-form
+          ref="deptBudgetList"
+          :rules="ruleDeptBudget"
+          :model="deptBudgetList"
+        >
+          <!--备注信息-->
           <ws-input
             v-model="deptBudgetList.remarks"
             type="textarea"
@@ -518,12 +486,13 @@
             :appendix-ids="appendixIdsAdd"
             :vesselId="deptBudgetList.addressUrl"
             :size-limit="size"
+            @uploadSuccess="uploadSuccess"
+            @onChange="onChange"
             accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
           />
-          <!-- </base-card> -->
-        </ws-info-table>
-      </ws-form>
-      <div style="text-align: right; padding: 10px">
+        </ws-form>
+      </div>
+      <div style="text-align: right; padding: 10px" class="center">
         <el-button
           class="bg-bottom"
           type="primary"
@@ -532,18 +501,13 @@
           >提交</el-button
         >
       </div>
->>>>>>> 110c456e325af9782535b7bcbce2d1b72d0f4f03
     </div>
   </div>
 </template>
 <script>
 // import { getVesselOne } from '@/model/procurement/basic'
 // import { dayjs } from 'base-core-lib'
-import {
-  examineList,
-   editInfo,
-   packList,
-}from '@/model/contarct/index'
+import { examineList, editInfo, packList } from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   watch: {
@@ -570,15 +534,15 @@ export default {
       // 提交类型
       submitType: true,
       tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
-      pickerBeginDateBefore:{},
+      pickerBeginDateBefore: {},
       // selectpackingMethod:{},
-       selectunitList:{},
+      selectunitList: {},
       //  change:{},
-     unitList:{},
+      unitList: {},
       packtypeList: {},
-      compId:{},
-      appendixIdsAdd:{},
-      size:{},
+      compId: {},
+      appendixIdsAdd: {},
+      size: {},
       deptBudgetList: {},
       ruleDeptBudget: {},
       isEdited: false,
@@ -597,8 +561,8 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
-     this.loaddata()
-     this.editInfo()
+    this.loaddata()
+    this.editInfo()
     this.showType = this.isShow
     console.log(this.$route.params)
     this.showType = this.isShow
@@ -611,7 +575,7 @@ export default {
     returnsales() {
       this.$router.push({ path: 'salesContract' })
     },
-     loaddata() {
+    loaddata() {
       // 数据
       examineList({ id: this.$route.params.id })
         .toPromise()
@@ -645,12 +609,9 @@ export default {
           this.ChapterTwoList = response
         })
     },
-    editInfo(){
-       editInfo({
-        
-
-       })
-    }
+    editInfo() {
+      editInfo({})
+    },
     // getList(){}
   },
 }