Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

src/api/purchase/DemandSummary.js

@@ -15,4 +15,11 @@ export function getSummaryDetail(data) {
     method: 'post',
     data: data
   })
+}
+// 采购需求汇总审核
+export function auditSummary(id) {
+  return request({
+    url: `/pu/demand/audit/${id}`,
+    method: 'get',
+  })
 }

src/api/purchase/basic.js

@@ -37,4 +37,12 @@ export function delDivision(ids) {
     url: `/material/division/delete/${ids}`,
     method: 'DELETE',
   })
+}
+// 参照统一接口
+export function getRefer(data) {
+  return request({
+    url: '/refer/query',
+    method: 'post',
+    data: data
+  })
 }

src/views/business/spd/bo/statement/index.vue

@@ -1,41 +1,41 @@
 <template>
   <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="商机名称" prop="boName">
+        <el-input
+          v-model="queryParams.boName"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户" prop="customerName">
+        <el-input
+          v-model="queryParams.customerName"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="负责人" prop="principalName">
+        <el-input
+          v-model="queryParams.principalName"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="商机来源" prop="boSource">
+        <el-input
+          v-model="queryParams.boSource"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="SPD商机" name="0">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="商机名称" prop="boName">
-            <el-input
-              v-model="queryParams.boName"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="客户" prop="customerName">
-            <el-input
-              v-model="queryParams.customerName"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="负责人" prop="principalName">
-            <el-input
-              v-model="queryParams.principalName"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="商机来源" prop="boSource">
-            <el-input
-              v-model="queryParams.boSource"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
         <el-table :data="boList" >
           <el-table-column label="客户" align="center" prop="customerName" />
           <el-table-column label="部门" align="center" prop="deptName" />
@@ -93,10 +93,286 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="耗材集采商机" name="1">功能开发中</el-tab-pane>
-      <el-tab-pane label="耗材集采商机" name="2">功能开发中</el-tab-pane>
-      <el-tab-pane label="医疗设备商机" name="3">功能开发中</el-tab-pane>
-      <el-tab-pane label="军队医疗设备商机" name="4">功能开发中</el-tab-pane>
+      <el-tab-pane label="耗材集采商机" name="1">
+        <el-table :data="boList" >
+          <el-table-column label="客户" align="center" prop="customerName" />
+          <el-table-column label="部门" align="center" prop="deptName" />
+          <el-table-column label="负责人" align="center" prop="principalName" />
+          <el-table-column label="商机名称" align="center" prop="boName" />
+          <el-table-column label="商机编码" align="center" prop="boCode" />
+          <el-table-column label="创建日期" align="center" prop="createTime" />
+          <el-table-column label="商机挖掘" align="center" prop="b100">
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b100">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b100}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="商机审核" align="center" prop="b101" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b101">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b101}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目立项" align="center" prop="b102" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b102">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b102}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="解决方案" align="center" prop="b104" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b104">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b104}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="院内决策" align="center" prop="b105" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b105">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b105}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="投标与签合同" align="center" prop="b106" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b106">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b106}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="完成" align="center" prop="b199" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b199">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b199}}
+              </dev>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="耗材集采商机" name="2">
+        <el-table :data="boList" >
+          <el-table-column label="客户" align="center" prop="customerName" />
+          <el-table-column label="部门" align="center" prop="deptName" />
+          <el-table-column label="负责人" align="center" prop="principalName" />
+          <el-table-column label="商机名称" align="center" prop="boName" />
+          <el-table-column label="商机编码" align="center" prop="boCode" />
+          <el-table-column label="创建日期" align="center" prop="createTime" />
+          <el-table-column label="商机挖掘" align="center" prop="b200">
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b200">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b200}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="需求信息收集" align="center" prop="b201">
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b201">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b201}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="商机审核" align="center" prop="b202" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b202">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b202}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目立项" align="center" prop="b203" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b203">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b203}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="解决方案" align="center" prop="b205" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b205">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b205}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="临床申请" align="center" prop="b206" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b206">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b206}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="院内决策" align="center" prop="b207" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b207">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b207}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="投标与签合同" align="center" prop="b208" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b208">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b208}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="完成" align="center" prop="b299" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b299">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b299}}
+              </dev>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="医疗设备商机" name="3">
+        <el-table :data="boList" >
+          <el-table-column label="客户" align="center" prop="customerName" />
+          <el-table-column label="部门" align="center" prop="deptName" />
+          <el-table-column label="负责人" align="center" prop="principalName" />
+          <el-table-column label="商机名称" align="center" prop="boName" />
+          <el-table-column label="商机编码" align="center" prop="boCode" />
+          <el-table-column label="创建日期" align="center" prop="createTime" />
+          <el-table-column label="商机挖掘" align="center" prop="b300">
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b300">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b300}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="需求信息收集" align="center" prop="b301">
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b301">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b301}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="商机审核" align="center" prop="b302" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b302">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b302}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目立项" align="center" prop="b303" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b303">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b303}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="解决方案" align="center" prop="b306" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b306">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b306}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="投标与签合同" align="center" prop="b307" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b307">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b307}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="完成" align="center" prop="b399" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b399">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b399}}
+              </dev>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="军队医疗设备商机" name="4">
+        <el-table :data="boList" >
+          <el-table-column label="客户" align="center" prop="customerName" />
+          <el-table-column label="部门" align="center" prop="deptName" />
+          <el-table-column label="负责人" align="center" prop="principalName" />
+          <el-table-column label="商机名称" align="center" prop="boName" />
+          <el-table-column label="商机编码" align="center" prop="boCode" />
+          <el-table-column label="创建日期" align="center" prop="createTime" />
+          <el-table-column label="商机挖掘" align="center" prop="b400">
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b400">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b400}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="需求信息收集" align="center" prop="b401">
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b401">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b401}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="商机审核" align="center" prop="b402" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b402">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b402}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目立项" align="center" prop="b403" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b403">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b403}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="解决方案" align="center" prop="b406" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b406">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b406}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="投标与签合同" align="center" prop="b407" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b407">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b407}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="完成" align="center" prop="b499" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b499">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b499}}
+              </dev>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
     </el-tabs>
 
     <pagination
@@ -148,7 +424,7 @@ export default {
     /** 查询任务列表 */
     getList() {
       var e = {
-        name: '0',
+        name: this.activeName,
       }
       this.handleClick(e);
     },
@@ -188,18 +464,165 @@ export default {
                 this.boList[i].b099 = nodesfilter[0].day;
               }
             }
-            console.log('this.boList',this.boList);
             this.total = response.total;
             this.loading = false;
           });
           break;
         case "1":
+          listBasic(this.queryParams).then(response => {
+            this.boList = response.rows;
+            for(var i = 0;i < this.boList.length;i++){
+              var nodes = this.boList[i].boNodeFlowList;
+              var nodesfilter = nodes.filter(n => n.code == '1-00');
+              if(nodesfilter.length > 0){
+                this.boList[i].b100 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '1-01');
+              if(nodesfilter.length > 0){
+                this.boList[i].b101 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '1-02');
+              if(nodesfilter.length > 0){
+                this.boList[i].b102 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '1-04');
+              if(nodesfilter.length > 0){
+                this.boList[i].b104 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '1-05');
+              if(nodesfilter.length > 0){
+                this.boList[i].b105 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '1-06');
+              if(nodesfilter.length > 0){
+                this.boList[i].b106 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '1-99');
+              if(nodesfilter.length > 0){
+                this.boList[i].b199 = nodesfilter[0].day;
+              }
+            }
+            this.total = response.total;
+            this.loading = false;
+          });
           break;
         case "2":
+          listBasic(this.queryParams).then(response => {
+            this.boList = response.rows;
+            for(var i = 0;i < this.boList.length;i++){
+              var nodes = this.boList[i].boNodeFlowList;
+              var nodesfilter = nodes.filter(n => n.code == '2-00');
+              if(nodesfilter.length > 0){
+                this.boList[i].b200 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '2-01');
+              if(nodesfilter.length > 0){
+                this.boList[i].b201 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '2-02');
+              if(nodesfilter.length > 0){
+                this.boList[i].b202 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '2-03');
+              if(nodesfilter.length > 0){
+                this.boList[i].b203 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '2-05');
+              if(nodesfilter.length > 0){
+                this.boList[i].b205 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '2-06');
+              if(nodesfilter.length > 0){
+                this.boList[i].b206 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '2-07');
+              if(nodesfilter.length > 0){
+                this.boList[i].b207 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '2-99');
+              if(nodesfilter.length > 0){
+                this.boList[i].b299 = nodesfilter[0].day;
+              }
+            }
+            this.total = response.total;
+            this.loading = false;
+          });
           break;
         case "3":
+          listBasic(this.queryParams).then(response => {
+            this.boList = response.rows;
+            for(var i = 0;i < this.boList.length;i++){
+              var nodes = this.boList[i].boNodeFlowList;
+              var nodesfilter = nodes.filter(n => n.code == '3-00');
+              if(nodesfilter.length > 0){
+                this.boList[i].b300 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '3-01');
+              if(nodesfilter.length > 0){
+                this.boList[i].b301 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '3-02');
+              if(nodesfilter.length > 0){
+                this.boList[i].b302 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '3-03');
+              if(nodesfilter.length > 0){
+                this.boList[i].b303 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '3-06');
+              if(nodesfilter.length > 0){
+                this.boList[i].b306 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '3-07');
+              if(nodesfilter.length > 0){
+                this.boList[i].b307 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '3-99');
+              if(nodesfilter.length > 0){
+                this.boList[i].b399 = nodesfilter[0].day;
+              }
+            }
+            this.total = response.total;
+            this.loading = false;
+          });
           break;
         case "4":
+          listBasic(this.queryParams).then(response => {
+            this.boList = response.rows;
+            for(var i = 0;i < this.boList.length;i++){
+              var nodes = this.boList[i].boNodeFlowList;
+              var nodesfilter = nodes.filter(n => n.code == '4-00');
+              if(nodesfilter.length > 0){
+                this.boList[i].b400 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '4-01');
+              if(nodesfilter.length > 0){
+                this.boList[i].b401 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '4-02');
+              if(nodesfilter.length > 0){
+                this.boList[i].b402 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '4-03');
+              if(nodesfilter.length > 0){
+                this.boList[i].b403 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '4-06');
+              if(nodesfilter.length > 0){
+                this.boList[i].b406 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '4-07');
+              if(nodesfilter.length > 0){
+                this.boList[i].b407 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '4-99');
+              if(nodesfilter.length > 0){
+                this.boList[i].b499 = nodesfilter[0].day;
+              }
+            }
+            this.total = response.total;
+            this.loading = false;
+          });
           break;
         default:
           break;

src/views/purchase/DemandSummary/index.vue

@@ -286,7 +286,7 @@
           <el-button type="primary" size="small">保存</el-button>
           <el-button type="primary" size="small">确认</el-button>
           <el-button type="primary" size="small">取消</el-button>
-          <el-button type="primary" size="small">审核</el-button>
+          <el-button type="primary" size="small" @click="audits">审核</el-button>
           <el-button type="primary" size="small">弃审</el-button>
 
           <el-dropdown size="small" @command="handleCommand">
@@ -391,7 +391,7 @@
 <script>
 import Add from './add.vue'
 import CollapseTransition from '@/components/MyCollapse/collapse.vue'
-import {getSummaryList} from '@/api/purchase/DemandSummary.js'
+import {getSummaryList, auditSummary} from '@/api/purchase/DemandSummary.js'
 export default {
   name: 'demandSummary',
   components: {
@@ -447,7 +447,7 @@ export default {
     },
     handleSelectionChange(selection) {
       console.log('选中', selection)
-      this.ids = selection.map(item => item.id)
+      this.ids = selection.map(item => item.demandItemId)
       console.log('选中数组', this.ids.join())
     },
     handleCommand(command) {
@@ -471,7 +471,20 @@ export default {
     },
     drop() {
       this.expanded = !this.expanded
-    }
+    },
+    audits() {
+      if(this.ids.length == 0) {
+        this.$modal.msgWarning("请选中至少一条数据");
+      } else {
+        let param = this.ids.join()
+        auditSummary(param).then(res => {
+          if (res.code === 200) {
+            this.$modal.msgSuccess("审核成功");
+            this.getList(this.queryParams)
+          }
+        })
+      }
+    },
   }
 }
 </script>

src/views/purchase/PurchaseDemandList/add.vue

@@ -17,13 +17,9 @@
 
         <el-col :span="1.5">
             <el-form-item label="组织">
-              <el-input
-                v-model="basicForm.org"
-                size="small"
-                placeholder=""
-                clearable
-                style="width: 200px"
-              />
+              <el-input v-model="basicForm.org" size="small" style="width: 200px">
+               <el-button slot="append" icon="el-icon-more" @click="chooseOrg"></el-button>
+              </el-input>
             </el-form-item>
          </el-col>
 
@@ -181,7 +177,7 @@
           </el-col>
 
           <el-col :span="1.5">
-            <el-form-item label="是否特殊需求">
+            <el-form-item label="是否客户指定">
               <el-input
                 v-model="basicForm.isSpeical"
                 size="small"
@@ -192,7 +188,7 @@
             </el-form-item>
          </el-col>
 
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-form-item label="是否处理需求">
               <el-input
                 v-model="basicForm.isProcess"
@@ -202,7 +198,7 @@
                 style="width: 200px"
               />
             </el-form-item>
-         </el-col>
+         </el-col> -->
 
           <el-col :span="1.5">
             <el-form-item label="是否月销量计算">
@@ -305,10 +301,10 @@
           </el-table-column>
           <el-table-column label="采购员名称" align="center" prop="buyerName" />
           <el-table-column label="采购员" align="center" width="150" prop="buyer" />
-          <el-table-column label="物料编码" align="center" width="120" prop="material">
+          <el-table-column label="物料编码" align="center" width="120" prop="materialCode">
             <template slot-scope="scope">
               <el-form-item class="hang">
-                <el-input v-model="scope.row.material"/>
+                <el-input v-model="scope.row.materialCode"/>
               </el-form-item>
             </template>
           </el-table-column>
@@ -376,7 +372,7 @@
             </template>
           </el-table-column> 
           <el-table-column label="采购备注" align="center" width="150" prop="puRemark" />
-          <el-table-column label="末级供应仓库存量" align="center" width="150" prop="lastWarehouseQty" />
+          <!-- <el-table-column label="末级供应仓库存量" align="center" width="150" prop="lastWarehouseQty" /> -->
           <!-- <el-table-column label="调拨占有量" align="center" width="150" prop="superiorAllotQty"></el-table-column> -->
           <el-table-column label="最终净需求量" align="center" width="150" prop="resDemandQty">
             <template slot-scope="scope">
@@ -423,13 +419,13 @@
           </el-table-column>
           <el-table-column label="默认采购组织" align="center" width="150" prop="purOrgName" />
           <el-table-column label="默认采购组织编码" align="center" width="150" prop="puOrg" />
-          <el-table-column label="末级供应调拨待入量" align="center" width="150" prop="lastStockQty">
+          <!-- <el-table-column label="末级供应调拨待入量" align="center" width="150" prop="lastStockQty">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input v-model="scope.row.lastStockQty"/>
               </el-form-item>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="上级供应中心现存量" align="center" width="150" prop="superiorCenterQty" />
           <el-table-column label="上级库存被调拨占用量" align="center" width="150" prop="superiorAllotQty" />
           <el-table-column label="可用量" align="center" width="150" prop="availableQty" />
@@ -469,7 +465,7 @@
             </template>
           </el-table-column>
           <!-- <el-table-column label="末级供应库存组织" align="center" width="150" prop="updateTime"></el-table-column> -->
-          <!-- <el-table-column label="上级供应中心库存组织" align="center" width="150" prop="updateTime"></el-table-column> -->
+          <el-table-column label="中心仓可用量" align="center" width="150" prop="updateTime"></el-table-column>
           <!-- <el-table-column label="调拨单号" align="center" width="150" prop="updateTime"></el-table-column> -->
           <!-- <el-table-column label="收货地址" align="center" width="150" prop="updateTime"></el-table-column> -->
           <!-- <el-table-column label="收货地址编码" align="center" width="150" prop="updateTime" /> -->
@@ -510,6 +506,7 @@
 <script>
 import Reserved from './reserved.vue'
 import {addDemand,getDemandDetail, getDemandSonDetail, editDemand} from '@/api/purchase/purchaseDemand.js'
+import {getRefer} from '@/api/purchase/basic.js'
 export default {
   name: 'addDemandList',
   props: ['pageStu','row', 'disable'],
@@ -602,7 +599,7 @@ export default {
         materialClassifyThreeName: null,
         materialClassifyFour: null,
         materialClassifyFourName: null,
-        material: null,
+        materialCode: null,
         materialName: null,
         specification: null,
         unit: null,
@@ -723,6 +720,12 @@ export default {
 	  updateReserved (val) {
       this.dialog.config = val
     },
+    chooseOrg() {
+      getRefer({type:'ORG_PARAM', search:'BB国际'}).then(res => {
+        console.log("🚀 ~ file: add.vue:725 ~ getRefer ~ res:", res)
+        
+      })
+    },
   }
 }
 </script>

src/views/purchase/PurchaseDemandList/index.vue

@@ -40,7 +40,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="1.5">
-            <el-form-item label="是否已处理需求">
+            <el-form-item label="是否客户指定">
               <el-select v-model="queryParams.isProcess" size="small" style="width: 200px" clearable placeholder="请选择">
                 <el-option
                   v-for="item in options"
@@ -194,21 +194,21 @@
         <el-table 
           :data="tableList" 
           fit
-          max-height="680"
+          max-height="350"
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="55" />
           <el-table-column label="编码" align="center" prop="code"/>
           <el-table-column label="需求日期" align="center" width="200" prop="demandDate" />
           <el-table-column label="单据状态" align="center" prop="status" />
-          <el-table-column label="是否已处理需求" align="center" width="150" prop="isProcess" />
+          <!-- <el-table-column label="是否已处理需求" align="center" width="150" prop="isProcess" /> -->
           <el-table-column label="业务类型" align="center" width="150" prop="billType"/>
-          <el-table-column label="是否特殊需求" align="center" width="150" prop="isSpeical" />
+          <!-- <el-table-column label="是否特殊需求" align="center" width="150" prop="isSpeical" /> -->
           <el-table-column label="需求人员" align="center" width="150" prop="demandPersonalName" />
           <el-table-column label="需求客户" align="center" prop="customerName" />
           <el-table-column label="需求部门" align="center" width="150" prop="demandDeptName" />
-          <el-table-column label="供应仓库" align="center" width="120" prop="warehouseName" />
-          <el-table-column label="供应货位" align="center" width="150" prop="goodsAllocationName" />
+          <!-- <el-table-column label="供应仓库" align="center" width="120" prop="warehouseName" /> -->
+          <!-- <el-table-column label="供应货位" align="center" width="150" prop="goodsAllocationName" /> -->
           <el-table-column label="单据来源" align="center" width="150" prop="source" />
           <el-table-column label="组织" align="center" width="150" prop="orgName" />
           <el-table-column label="备注" align="center" width="150" prop="remark" />