simple 5 vuotta sitten
vanhempi
commit
2d95295040

+ 1 - 0
config/download.js

@@ -4,6 +4,7 @@ const prodServer = require('./prod/' + project + '.js'); //服务信息
 export default (url = '', baseUrl = '', data = {}, dataType = 'JSON', type = 'GET', requestType = 'FORMDATA') => {
   var html = '<div class="ivu-spin-fullscreen ivu-spin-fullscreen-wrapper"><div class="ivu-spin ivu-spin-fix ivu-spin-show-text ivu-spin-fullscreen"><div class="ivu-spin-main"><span class="ivu-spin-dot"></span> <div class="ivu-spin-text"><div><i class="ivu-icon ivu-icon-load-c demo-spin-icon-load" style="font-size: 18px;"></i><div>Loading</div></div></div></div></div></div>'
   $('#app').append(html);
+  // debugger
   type = type.toUpperCase();
   if (process.env.NODE_ENV === 'development') {
     baseUrl = baseUrl;

+ 2 - 3
config/index.js

@@ -61,9 +61,8 @@ module.exports = {
       },
       "/purchase": { //采采购管理整体测试
         // target: "http://www.jihengcc.cn:17080/purchase", //采购供应商管理测试
-        // target: "https://test.hajwy.com/purchase", //采购供应商管理测试
-        target: "https://test.hajwy.com/purchase",
-        // target: "http://172.18.1.253:8080/purchase",
+        target: "https://test.hajwy.com/purchase", //采购供应商管理测试
+        // target: "http://172.18.1.40:8989/purchase",
         secure: false,
         changeOrigin: true,
         pathRewrite: {

+ 22 - 10
src/page/baseInfo/components/supply/supplyEdit.vue

@@ -5,8 +5,12 @@
       <Card style="width:100%" :bordered="false" :dis-hover="true">
         <p slot="title">供应商详情</p>
         <div slot="extra">
-          <Button v-if="!editing" @click="editing = true">编辑</Button>
-          <Button v-else @click="editGys">保存</Button>
+          <span v-if="canEdit">
+            <Button v-if="!editing" @click="editing = true">编辑</Button>
+            <Button v-else @click="editGys">保存</Button>
+          </span>
+          <!-- <Button v-if="!editing" @click="editing = true">编辑</Button>
+          <Button v-else @click="editGys">保存</Button>-->
           <Button @click="cancel">取消</Button>
         </div>
         <Row class="mainCont">
@@ -92,9 +96,10 @@
               >{{ item.areaName }}</Option>
             </Select>
             <div
-              v-else
+              v-else-if="form.ssqy.length > 0"
               v-for="(item, index) in form.ssqy"
             >{{ssqyList.filter(a => a.areaId == item)[0].areaName }}</div>
+            <div v-else></div>
           </Col>
           <Col span="4" class-name="tables">
             分管采购员
@@ -108,7 +113,10 @@
                 :key="item.userId"
               >{{ item.userName }}</Option>
             </Select>
-            <span v-else>{{ fgcgyList.filter(a => a.userId == form.fgcgy)[0].userName }}</span>
+            <span
+              v-else-if="form.fgcgy"
+            >{{ fgcgyList.filter(a => a.userId == form.fgcgy)[0].userName }}</span>
+            <span v-else></span>
           </Col>
           <Col span="4" class-name="tables">
             启用状态
@@ -273,7 +281,8 @@
               placeholder="请输入"
               style="width: 99%"
             />
-            <span v-else v-html="form.zyyw.replace(/\n/g, '<br>')"></span>
+            <span v-else-if="form.zyyw" v-html="form.zyyw.replace(/\n/g, '<br>')"></span>
+            <span v-else></span>
           </Col>
         </Row>
         <Row class="uplCont" type="flex" justify="center" style="align-items: stretch">
@@ -289,7 +298,8 @@
               placeholder="请输入"
               style="width: 99%"
             />
-            <span v-else v-html="form.gysdz.replace(/\n/g, '<br>')"></span>
+            <span v-else-if="form.gysdz" v-html="form.gysdz.replace(/\n/g, '<br>')"></span>
+            <span v-else></span>
           </Col>
         </Row>
         <Row class="uplCont" type="flex" justify="center" style="align-items: stretch">
@@ -336,8 +346,8 @@
           <span slot="extra">
             <Button v-if="tabs == '2'" type="primary" @click="addXzbj">新增报价</Button>
             <!-- <Button v-if="tabs == '3'" type="primary" @click="yrryShow = true">引入员工</Button> -->
-            <Button v-if="tabs == '3'" type="primary" @click="addXzry">新增联系人</Button>
-            <Button v-if="tabs == '4'" type="primary" @click="addXzyhzh">新增账号</Button>
+            <Button v-if="tabs == '3'&& canEdit" type="primary" @click="addXzry">新增联系人</Button>
+            <Button v-if="tabs == '4'&& canEdit" type="primary" @click="addXzyhzh">新增账号</Button>
           </span>
           <TabPane label="供货详情" name="1">
             <Table
@@ -382,7 +392,7 @@
                 <div>{{ row.gpcDefault == '1' ? '是' : '否' }}</div>
               </template>
               <template slot-scope="{ row, index }" slot="action">
-                <div>
+                <div v-if="canEdit">
                   <a href="javascript:;" @click="editRy(row)">编辑</a>
                   <a href="javascript:;" v-if="row.state" @click="deleteRy(row)">删除</a>
                 </div>
@@ -401,7 +411,7 @@
                 <div>{{ row.gpbcDefault == '1' ? '是' : '否' }}</div>
               </template>
               <template slot-scope="{ row, index }" slot="action">
-                <div>
+                <div v-if="canEdit">
                   <a href="javascript:;" @click="editYhzh(row)">编辑</a>
                   <a href="javascript:;" v-if="row.state" @click="deleteYhzh(row)">删除</a>
                 </div>
@@ -620,6 +630,7 @@ export default {
       spinShow: true,
       contentShow: true,
       editing: true,
+      canEdit: true,
       tabs: "1",
       uploadHeaders: {
         token: localStorage.token,
@@ -1434,6 +1445,7 @@ export default {
       this.form.bz = "";
       this.form.filesList = [];
       this.tabs = "1";
+      this.canEdit = true;
       this.$emit("return");
     },
     //获取详情数据

+ 6 - 2
src/page/baseInfo/supply.vue

@@ -82,7 +82,7 @@
         </template>
         <template slot-scope="{ row, index }" slot="action">
           <div>
-            <a href="javascript:;" @click="editRow(row.gpId)">编辑</a>
+            <a href="javascript:;" @click="editRow(row.gpId, row.gpInfoType)">编辑</a>
             <a v-if="row.gpInfoType == 1" href="javascript:;" @click="deleteRow(row.gpId)">删除</a>
           </div>
         </template>
@@ -279,7 +279,11 @@ export default {
       exportGoodProviderInfo(postData);
     },
     //供应商详情
-    editRow(id) {
+    editRow(id, type) {
+      if (type == '2') {
+        this.$refs.edit.editing = false;
+        this.$refs.edit.canEdit = false;
+      }
       this.editId = id;
       this.editShow = true;
       this.$refs.edit.getGys();

+ 18 - 9
src/page/purchase/components/balance/balanceAdd.vue

@@ -63,7 +63,7 @@
           </Col>
           <Col span="4" class-name="tables">
             <Select
-              :disabled="form.spzt == '3'"
+              :disabled="form.spzt != '1' && form.spzt != '4'"
               clearable
               v-model="form.gys"
               filterable
@@ -84,7 +84,7 @@
           <Col span="4" class-name="tables">
             <Input
               v-model="form.khh"
-              :disabled="form.spzt == '3'"
+              :disabled="form.spzt != '1' && form.spzt != '4'"
               placeholder="请输入"
               style="width: 95%"
             />
@@ -96,7 +96,7 @@
           <Col span="4" class-name="tables">
             <Input
               v-model="form.zh"
-              :disabled="form.spzt == '3'"
+              :disabled="form.spzt != '1' && form.spzt != '4'"
               placeholder="请输入"
               style="width: 95%"
             />
@@ -106,7 +106,12 @@
             <span class="mustSpan">*</span>
           </Col>
           <Col span="4" class-name="tables">
-            <Select clearable v-model="form.djlx" :disabled="form.spzt == '3'" style="width: 95%">
+            <Select
+              clearable
+              v-model="form.djlx"
+              :disabled="form.spzt != '1' && form.spzt != '4'"
+              style="width: 95%"
+            >
               <Option
                 v-for="item in djlxList"
                 :value="item.value"
@@ -136,7 +141,7 @@
           <Col span="4" class-name="tables">
             <Input
               v-model="form.tzje"
-              :disabled="form.spzt == '3'"
+              :disabled="form.spzt != '1' && form.spzt != '4'"
               placeholder="请输入"
               style="width: 95%"
             />
@@ -158,6 +163,7 @@
               <span v-if="form.spzt == '2'">审核中</span>
               <span v-if="form.spzt == '3'">审核通过</span>
               <span v-if="form.spzt == '4'">审核拒绝</span>
+              <span v-if="form.spzt == '5'">已付款</span>
             </div>
           </Col>
           <Col span="4" class-name="tables"></Col>
@@ -167,7 +173,7 @@
           <Col span="4" class-name="upl">附件</Col>
           <Col span="10" class-name="uplf">
             <Upload
-              :disabled="form.spzt == '3'"
+              :disabled="form.spzt != '1' && form.spzt != '4'"
               :headers="uploadHeaders"
               style="width: 80%"
               multiple
@@ -198,7 +204,7 @@
           <Col span="20" class-name="tables">
             <Input
               v-model="form.sm"
-              :disabled="form.spzt == '3'"
+              :disabled="form.spzt != '1' && form.spzt != '4'"
               placeholder="请输入"
               style="width: 99%"
             />
@@ -211,13 +217,13 @@
         <div slot="extra">
           <Button
             type="primary"
-            :disabled="balanceType == 'add' || form.spzt == '3'"
+            :disabled="balanceType == 'add' || (form.spzt != '1' && form.spzt != '4')"
             @click="addMxShow"
           >新增明细</Button>
         </div>
         <Table :columns="tableColumn" style="width: 100%" :data="tableData" :loading="tableLoading">
           <template slot-scope="{ row, index }" slot="cz">
-            <div>
+            <div v-if="form.spzt != '1' && form.spzt != '4'">
               <a href="javascript:;" @click="deleteMx(row, index)">删除</a>
             </div>
           </template>
@@ -439,6 +445,9 @@ export default {
     editJs() {
       let postData = {
         settlementId: this.settlementId,
+        projectId: this.form.glxm,
+        projectName: this.glxmList.filter(a => a.projectId == this.form.glxm)[0]
+          .projectName,
         areaId: this.form.glqy,
         areaName: this.glqyList.filter(a => a.areaId == this.form.glqy)[0]
           .areaName,

+ 1 - 2
src/page/purchase/components/balance/balanceMxAdd.vue

@@ -7,9 +7,8 @@
       </div>
       <Row :gutter="10" style="margin-bottom: 10px">
         <Col span="4">
-          <Select v-model="addForm.ssxm" placeholder="项目名称" style="width: 95%">
+          <Select v-model="addForm.ssxm" disabled placeholder="项目名称" style="width: 95%">
             <Option
-              disabled
               v-for="item in ssxmList"
               :value="item.projectId"
               :key="item.projectId"

+ 12 - 9
src/page/purchase/components/plan/planAdd.vue

@@ -84,10 +84,7 @@
               placeholder="请选择"
             ></DatePicker>
           </Col>
-          <Col span="4" class-name="tables">
-            分管采购员
-            <span class="mustSpan">*</span>
-          </Col>
+          <Col span="4" class-name="tables">分管采购员</Col>
           <Col span="4" class-name="tables">
             <Select
               v-model="form.fgcgy"
@@ -322,7 +319,7 @@ export default {
         ssqy: "", //所属区域
         ssxm: "", //所属项目
         jhlx: "", //计划类型
-        fgcgy: "", //分管采购员
+        fgcgy: ",", //分管采购员
         totalPrice: 0, //总价
         sqr: localStorage.user_name, //申请人
         filesList: []
@@ -349,7 +346,7 @@ export default {
         {
           type: "selection",
           width: 60,
-          align: "center",
+          align: "center"
         },
         {
           title: "物料编码",
@@ -510,11 +507,16 @@ export default {
           this.form.ssxm = `${res.data.projectId},${res.data.projectName}`;
           this.form.jhlx = res.data.type;
           this.form.date = res.data.applyMonth;
-          this.form.fgcgy = res.data.purchaserName;
+          // this.form.fgcgy = res.data.purchaserName;
           this.form.sqr = res.data.applicantName;
           this.form.spzt = res.data.applyStatus;
           this.form.status = res.data.status;
           this.form.fgcgy = `${res.data.purchaserId},${res.data.purchaserName}`;
+          this.form.ylh = res.data.gpUnionpayNo;
+          this.form.sf = res.data.gpProvince;
+          this.form.yb = res.data.gpPostalCode;
+          this.form.email = res.data.gpEmail;
+          this.form.fax = res.data.gpFax;
           this.form.filesList = res.data.attachmentList;
           this.form.sm = res.data.remark;
           this.requestId = res.requestId;
@@ -543,7 +545,7 @@ export default {
     },
     //新增申购计划
     addSgjh() {
-      let mustArr = ["ssqy", "ssxm", "jhlx", "date", "fgcgy"];
+      let mustArr = ["ssqy", "ssxm", "jhlx", "date"];
       for (let i in mustArr) {
         if (!this.form[mustArr[i]]) {
           this.$Message.error("请将信息填写完整!");
@@ -701,6 +703,7 @@ export default {
     addMxShow() {
       this.contentShow = false;
       this.$refs.add.projectId = this.form.ssxm;
+      this.$refs.add.documentNo = this.form.jhdjh;
       this.$refs.add.getTableData();
     },
     //返回、取消
@@ -713,7 +716,7 @@ export default {
         ssqy: "", //所属区域
         ssxm: "", //所属项目
         jhlx: "", //计划类型
-        fgcgy: "", //分管采购员
+        fgcgy: ",", //分管采购员
         totalPrice: 0, //总价
         sqr: localStorage.user_name, //申请人
         filesList: []

+ 0 - 427
src/page/purchase/components/plan/planEdit.vue

@@ -1,427 +0,0 @@
-<template>
-  <div>
-    <!-- 页面主体内容 -->
-    <div class="planAddContent" v-show="contentShow">
-      <Card style="width:100%" :bordered="false" :dis-hover="true">
-        <p slot="title">申购计划详情</p>
-        <div slot="extra">
-          <Button>保存</Button>
-          <Button>提交</Button>
-          <Button @click="$emit('return')">取消</Button>
-        </div>
-        <Row class="mainCont">
-          <Col span="4" class-name="tables">计划单据号</Col>
-          <Col span="4" class-name="tables">计算属性</Col>
-          <Col span="4" class-name="tables">所属区域</Col>
-          <Col span="4" class-name="tables">
-            <Select clearable v-model="form.ssqy" style="width: 95%">
-              <Option
-                v-for="item in ssqyList"
-                :value="item.value"
-                :key="item.value"
-              >{{ item.label }}</Option>
-            </Select>
-          </Col>
-          <Col span="4" class-name="tables">所属项目</Col>
-          <Col span="4" class-name="tables">
-            <Select clearable v-model="form.ssxm" style="width: 95%">
-              <Option
-                v-for="item in ssxmList"
-                :value="item.value"
-                :key="item.value"
-              >{{ item.label }}</Option>
-            </Select>
-          </Col>
-          <Col span="4" class-name="tables">标题</Col>
-          <Col span="4" class-name="tables">计算属性</Col>
-          <Col span="4" class-name="tables">参考总价(元)</Col>
-          <Col span="4" class-name="tables">计算属性</Col>
-          <Col span="4" class-name="tables">计划类型</Col>
-          <Col span="4" class-name="tables">
-            <Select clearable v-model="form.jhlx" style="width: 95%">
-              <Option
-                v-for="item in jhlxList"
-                :value="item.value"
-                :key="item.value"
-              >{{ item.label }}</Option>
-            </Select>
-          </Col>
-          <Col span="4" class-name="tables">计划月份</Col>
-          <Col span="4" class-name="tables">
-            <DatePicker
-              style="width: 95%"
-              format="yyyy-MM"
-              :value="form.date"
-              @on-change="form.date=$event"
-              type="month"
-              placeholder="请选择"
-            ></DatePicker>
-          </Col>
-          <Col span="4" class-name="tables">分管采购员</Col>
-          <Col span="4" class-name="tables">
-            <Select clearable v-model="form.fgcgy" style="width: 95%">
-              <Option v-for="item in cgyList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-            </Select>
-          </Col>
-          <Col span="4" class-name="tables">申请人</Col>
-          <Col span="4" class-name="tables">
-            <Select clearable v-model="form.sqr" style="width: 95%">
-              <Option v-for="item in sqrList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-            </Select>
-          </Col>
-          <Col span="4" class-name="tables">审批状态</Col>
-          <Col span="4" class-name="tables">计算属性</Col>
-          <Col span="4" class-name="tables"></Col>
-          <Col span="4" class-name="tables"></Col>
-          <Col span="4" class-name="tables"></Col>
-          <Col span="4" class-name="tables"></Col>
-        </Row>
-        <Row class="uplCont" type="flex" justify="center" style="align-items: stretch">
-          <Col span="4" class-name="upl">附件</Col>
-          <Col span="10" class-name="uplf">
-            <Upload
-              style="width: 80%"
-              multiple
-              type="drag"
-              action="/purchase/common/uploadFile"
-              :before-upload="beforeUpload"
-              :on-success="uploadFilesSuccess"
-              :show-upload-list="false"
-              :on-progress="upFilesLoading"
-            >
-              <!-- :default-file-list="xzwgForm.filesList" -->
-              <div style="padding: 5px 0">
-                <Icon type="md-cloud-upload" size="36" style="color: #3399ff"></Icon>
-                <span>点击或将文件拖拽到这里上传</span>
-              </div>
-            </Upload>
-          </Col>
-          <Col span="10" class="upl" style="padding: 5px">
-            <div v-for="(item, index) in form.filesList" :key="index">
-              <a href="javascript:;">{{ item.fullName }}</a>
-              <span style="float: right; cursor:pointer" @click="form.filesList.splice(index, 1)">x</span>
-            </div>
-            <p v-if="uploading" style="text-align: center">上传中...</p>
-          </Col>
-        </Row>
-        <Row class="mainCont">
-          <Col span="4" class-name="tables">说明</Col>
-          <Col span="20" class-name="tables">
-            <Input v-model="form.sm" placeholder="请输入" style="width: 99%" />
-          </Col>
-        </Row>
-        <Spin size="large" fix v-if="spinShow"></Spin>
-      </Card>
-      <Card style="width:100%" :bordered="false" :dis-hover="true">
-        <p slot="title">申购计划明细</p>
-        <div slot="extra">
-          <Button type="primary" @click="plszOpen">批量设置</Button>
-          <Button type="primary">批量导入</Button>
-          <Button type="primary" @click="contentShow = false">新增明细</Button>
-        </div>
-        <Table
-          :columns="tableColumn"
-          style="width: 100%"
-          :data="tableData"
-          :loading="tableLoading"
-          @on-select="tableOnSelect"
-        >
-          <template slot-scope="{ row, index }" slot="sgsl">
-            <div>
-              <Input v-model="tableData[index].sgsl" placeholder="请输入" style="width: 95%" />
-            </div>
-          </template>
-          <template slot-scope="{ row, index }" slot="rkck">
-            <Select clearable v-model="tableData[index].rkck" style="width: 95%" :transfer="true">
-              <Option v-for="item in ckList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-            </Select>
-          </template>
-          <template slot-scope="{ row, index }" slot="djr">
-            <div>
-              <Input v-model="tableData[index].djr" placeholder="请输入" style="width: 95%" />
-            </div>
-          </template>
-          <template slot-scope="{ row, index }" slot="djlx">
-            <Select clearable v-model="tableData[index].rkck" style="width: 95%" :transfer="true">
-              <Option v-for="item in djList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-            </Select>
-          </template>
-          <template slot-scope="{ row, index }" slot="jhdhsj">
-            <DatePicker
-              :transfer="true"
-              format="yyyy-MM-dd"
-              type="date"
-              :value="tableData[index].jhdhsj"
-              @on-change="tableData[index].jhdhsj=$event"
-              placeholder="请选择"
-              style="width: 95%"
-            ></DatePicker>
-          </template>
-          <!-- @on-change="((val, date) => tableDateChange(val, date ,index))" -->
-          <template slot-scope="{ row, index }" slot="bz">
-            <Input v-model="tableData[index].bz" placeholder="请输入" style="width: 95%" />
-          </template>
-          <template slot-scope="{ row, index }" slot="cz">
-            <div>
-              <a href="javascript:;">删除</a>
-            </div>
-          </template>
-        </Table>
-      </Card>
-      <Modal v-model="plszShow" title="批量设置" @on-ok="plszOk" @on-cancel="plszCancel">
-        <Row class="mainCont">
-          <Col span="12" class-name="tables">入库仓库</Col>
-          <Col span="12" class-name="tables">
-            <Select clearable v-model="plrkck" style="width: 95%" :transfer="true">
-              <Option v-for="item in ckList" :value="item.value" :key="item.value">{{ item.label }}</Option>
-            </Select>
-          </Col>
-          <Col span="12" class-name="tables">计划到货时间</Col>
-          <Col span="12" class-name="tables">
-            <DatePicker
-              :transfer="true"
-              format="yyyy-MM-dd"
-              type="date"
-              :value="pldhsj"
-              @on-change="pldhsj=$event"
-              placeholder="请选择"
-              style="width: 95%"
-            ></DatePicker>
-          </Col>
-        </Row>
-      </Modal>
-    </div>
-    <!-- 计划明细新增 -->
-    <planMxAdd @return="contentShow = true" v-show="!contentShow" />
-  </div>
-</template>
-
-<script>
-import planMxAdd from "./planMxAdd";
-export default {
-  components: {
-    planMxAdd
-  },
-  data() {
-    return {
-      spinShow: true,
-      contentShow: true,
-      form: {
-        date: "",
-        ssqy: "", //所属区域
-        ssxm: "", //所属项目
-        jhlx: "", //计划类型
-        fgcgy: "", //分管采购员
-        sqr: "", //申请人
-        filesList: []
-      },
-      ssqyList: [],
-      ssxmList: [],
-      jhlxList: [],
-      cgyList: [],
-      sqrList: [],
-      uploading: false,
-      // 批量设置
-      plszShow: false,
-      plrkck: "",
-      pldhsj: "",
-      // table
-      ckList: [],
-      djList: [],
-      tableColumn: [
-        {
-          type: "selection",
-          width: 60,
-          align: "center",
-        },
-        {
-          title: "采购订单",
-          key: "cgdd",
-          tooltip: "true",
-          width: 100
-        },
-        {
-          title: "物料编码",
-          key: "wlbm",
-          tooltip: "true",
-          width: 100
-        },
-        {
-          title: "物料分类",
-          key: "wlfl",
-          tooltip: "true",
-          width: 100
-        },
-        {
-          title: "物料名称",
-          key: "wlmc",
-          tooltip: "true",
-          width: 100
-        },
-        {
-          title: "规格型号",
-          key: "ggxh",
-          tooltip: "true",
-          width: 100
-        },
-        {
-          title: "单位",
-          key: "dw",
-          tooltip: "true",
-          width: 100
-        },
-        {
-          title: "库存量",
-          key: "kcl",
-          tooltip: "true",
-          width: 100
-        },
-        {
-          title: "申购数量",
-          slot: "sgsl",
-          tooltip: "true",
-          width: 100
-        },
-        {
-          title: "参考单价(元)",
-          key: "ckdj",
-          tooltip: "true",
-          width: 120
-        },
-        {
-          title: "参考总价(元)",
-          key: "ckzj",
-          tooltip: "true",
-          width: 120
-        },
-        {
-          title: "入库仓库",
-          slot: "rkck",
-          tooltip: "true",
-          width: 100
-        },
-        {
-          title: "对接人",
-          slot: "djr",
-          tooltip: "true",
-          width: 100
-        },
-        {
-          title: "单据类型",
-          slot: "djlx",
-          tooltip: "true",
-          width: 100
-        },
-        {
-          title: "计划到货时间",
-          slot: "jhdhsj",
-          tooltip: "true",
-          width: 130
-        },
-        {
-          title: "备注",
-          slot: "bz",
-          tooltip: "true",
-          width: 100
-        },
-        {
-          title: "操作",
-          slot: "cz",
-          tooltip: "true",
-          width: 60
-        }
-      ],
-      tableData: [],
-      tableSelect: [],
-      tableLoading: false
-    };
-  },
-  created() {
-    this.getTableData();
-  },
-  methods: {
-    //批量设置弹窗
-    plszOpen() {
-      this.plszShow = true;
-    },
-    plszOk() {},
-    plszCancel() {},
-    //表单上传
-    beforeUpload() {},
-    upFilesLoading() {
-      this.uploading = true;
-    },
-    uploadFilesSuccess(response, file, fileList) {
-      this.uploading = false;
-      this.form.filesList.push({
-        fileName: response.fileInfo.fileName,
-        fullName: response.fileInfo.fName,
-        resPath: response.fileInfo.resPath,
-        fileDetailType: ""
-      });
-    },
-    //获取明细列表
-    getTableData() {
-      this.spinShow = false;
-    },
-    tableOnSelect(selection, row) {},
-    //返回、取消
-    cancel() {
-      this.spinShow = true;
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-button {
-  min-width: 80px;
-}
-.uplCont {
-  border-left: 1px solid #e4e4e4;
-  .upl {
-    flex: auto;
-    border-right: 1px solid #e4e4e4;
-    &:nth-child(1) {
-      background: #f8f9fb;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
-  }
-  .uplf {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    min-height: 80px;
-  }
-}
-.mainCont .tables {
-  height: 50px;
-  border-right: 1px solid #e4e4e4;
-  border-bottom: 1px solid #e4e4e4;
-  line-height: 50px;
-  text-align: center;
-  &:nth-child(2n + 1) {
-    background: #f8f9fb;
-  }
-}
-.mainCont {
-  border-left: 1px solid #e4e4e4;
-  border-top: 1px solid #e4e4e4;
-}
-ivu-card-head-inner,
-.ivu-card-head p {
-  display: inline-block;
-  width: 100%;
-  height: 20px;
-  line-height: 20px;
-  font-size: 14px;
-  color: #17233d;
-  font-weight: 700;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  font-weight: normal;
-}
-</style>

+ 7 - 15
src/page/purchase/components/plan/planMxAdd.vue

@@ -119,6 +119,7 @@ export default {
   data() {
     return {
       projectId: "",
+      documentNo: "",
       //新增物料申请
       addShow: false,
       //新增物料申请表单
@@ -245,7 +246,8 @@ export default {
         measureUnit: this.addForm.jldw,
         goodsType: this.addForm.wllx,
         sgMark: this.addForm.sqsm,
-        companyId: localStorage.companyId
+        companyId: localStorage.companyId,
+        documentNo: this.documentNo
       };
       uploadStockGoods(postData).then(res => {
         if (res.status == 200) {
@@ -274,16 +276,12 @@ export default {
         sgNo: this.searchForm.wlmc,
         sgName: "",
         projectId: this.projectId.split(',')[0],
-        // projectId: 10
-        // queryText1: this.searchForm.wlmc
-        // projectIds: this.projectId.split(',')[0]
       };
       this.tableLoading = true;
       tbiStockGoodsList(postData).then(res => {
         this.tableLoading = false;
         if (res.status == 200) {
           this.tableData = res.data;
-          // this.pageTotal = res.data.total;
         }
       });
     },
@@ -307,14 +305,10 @@ export default {
           arriveTime: dateStr, //待确认  预测为计划到货时间
           linkedPersonId: localStorage.user_id,
           linkedPersonName: localStorage.user_name, //待确认
-          // firstClassName: this.tableSelect[item].gcName,
-          // firstClassId: this.tableSelect[item].gcId,
-          // secondClassId: this.tableSelect[item].gcTwoId,
-          // secondClassName: this.tableSelect[item].gcTwoName,
-          firstClassName: 'test',
-          firstClassId: 1,
-          secondClassId: 1,
-          secondClassName: 'test',
+          firstClassName: this.tableSelect[item].gcName,
+          firstClassId: this.tableSelect[item].gcId,
+          secondClassId: this.tableSelect[item].gcTwoId,
+          secondClassName: this.tableSelect[item].gcTwoName,
           brandName: this.tableSelect[item].sgBrand,
           specs: this.tableSelect[item].standardModel,
           unit: this.tableSelect[item].measureUnit,
@@ -323,8 +317,6 @@ export default {
           amount: 0,
           storehouseId: "", //入库仓库ID  主界面选择
           storehouseName: "", //入库仓库  主界面选择
-          // storehouseId: this.tableSelect[item].storehouseId, //入库仓库ID  主界面选择
-          // storehouseName: this.tableSelect[item].storehouseName, //入库仓库  主界面选择
           remark: ""
         });
       }

+ 1 - 0
src/page/purchase/purchaseBalance.vue

@@ -78,6 +78,7 @@
           <span v-if="row.approvalState == '2'">审核中</span>
           <span v-if="row.approvalState == '3'">审核通过</span>
           <span v-if="row.approvalState == '4'">审核拒绝</span>
+          <span v-if="row.approvalState == '5'">已付款</span>
         </template>
         <template slot-scope="{ row, index }" slot="action">
           <div>

+ 4 - 4
src/page/purchase/purchaseOrder.vue

@@ -120,10 +120,10 @@
       ref="add"
       :glqyList="ssqyList"
       :gysList="gysList"
-      @return="() => {addShow = false, getTableData()}"
+      @return="() => {addShow = false; getTableData()}"
       v-show="addShow"
     />
-    <orderPrint ref="print" @return="printShow = false" v-show="printShow" />
+    <orderPrint ref="print" @return="() => {printShow = false; getTableData()}" v-show="printShow" />
   </div>
 </template>
 
@@ -289,8 +289,8 @@ export default {
     },
     exportData() {
       let postData = {
-        areaIds: this.searchForm.ssqy,
-        projectIds: this.searchForm.glxm,
+        areaIds: `${this.searchForm.ssqy}`,
+        projectIds: `${this.searchForm.glxm}`,
         purchaserId: this.searchForm.cgr,
         startTime: this.searchForm.xdsj[0],
         endTime: this.searchForm.xdsj[1],

+ 3 - 2
src/page/purchase/purchasePlan.vue

@@ -33,6 +33,7 @@
         </Col>
         <Col span="6">
           <DatePicker
+            format="yyyy年MM月"
             :value="searchForm.jhyf"
             @on-change="searchForm.jhyf=$event"
             type="month"
@@ -122,12 +123,12 @@
     </Card>
     <planAdd
       ref="add"
-      @return="() => {addShow = false, getTableData()}"
+      @return="() => {addShow = false; getTableData()}"
       :ssqyList="ssqyList"
       :cgyList="fgcgyList"
       v-show="addShow"
     />
-    <planPrint ref="print" @return="printShow = false" v-show="printShow" />
+    <planPrint ref="print" @return="() => {printShow = false ; getTableData()}" v-show="printShow" />
   </div>
 </template>
 

+ 5 - 5
src/page/report/historyCost.vue

@@ -94,11 +94,11 @@ export default {
           title: "序号",
           width: 60
         },
-        {
-          title: "物料Id",
-          key: "materialId",
-          tooltip: "true"
-        },
+        // {
+        //   title: "物料Id",
+        //   key: "materialId",
+        //   tooltip: "true"
+        // },
         {
           title: "一级物料名称",
           key: "firstClassName",