调拨订单提交，bug修改

src/api/purchase/transferOrder.js

@@ -24,6 +24,14 @@ export function editOrder(data) {
     data: data
   })
 }
+// 调拨订单提交
+export function submitOrder(data) {
+  return request({
+    url: `/pu/allot/submit`,
+    method: 'post',
+    data: data
+  })
+}
 // 调拨订单详情
 // 调拨订单详情
 export function getOrderDetail(id) {

src/views/purchase/DemandSummary/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="demandSummary">
     <div v-if="isList">
-      <el-form class="search_area" label-width="120px">
+      <el-form class="search_area" label-width="100px">
         <el-row :gutter="10">
           <el-col :span="1.5">
             <el-form-item label="行状态">
@@ -32,16 +32,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="1.5">
-            <el-form-item label="生产厂家">
-              <el-input
-              v-model="queryParams.manufacturer"
-              size="small"
-              clearable
-              style="width: 200px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
             <el-form-item label="" label-width="20px">
               <el-button type="primary" size="small" icon="el-icon-search" plain @click="search">搜索</el-button>
               <el-button size="small" icon="el-icon-refresh" plain @click="reset">重置</el-button>
@@ -53,6 +43,16 @@
         <div v-show="expanded">
           <el-row :gutter="10">
             <el-col :span="1.5">
+              <el-form-item label="生产厂家">
+                <el-input
+                v-model="queryParams.manufacturer"
+                size="small"
+                clearable
+                style="width: 200px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
               <el-form-item label="预测分类">
                 <el-select v-model="queryParams.forecastClassification" size="small" style="width: 200px" clearable>
                   <el-option
@@ -70,20 +70,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="业务部门">
-                <el-select size="small" v-model="queryParams.departmentName" @focus="chooseRefer('DEPT_PARAM', true, '业务部门')" style="width: 200px">
-                  <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="审核人">
-                <el-select size="small" v-model="queryParams.puManagerAuditor" @focus="chooseRefer('CONTACTS_PARAM', true, '审核人')" style="width: 200px">
-                  <el-option v-for="item in auditOptions" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
           </el-row>
 
           <el-row :gutter="10">
@@ -99,6 +85,20 @@
               </el-form-item>
             </el-col> -->
             <el-col :span="1.5">
+              <el-form-item label="业务部门">
+                <el-select size="small" v-model="queryParams.departmentName" @focus="chooseRefer('DEPT_PARAM', true, '业务部门')" style="width: 200px">
+                  <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="审核人">
+                <el-select size="small" v-model="queryParams.puManagerAuditor" @focus="chooseRefer('CONTACTS_PARAM', true, '审核人')" style="width: 200px">
+                  <el-option v-for="item in auditOptions" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
               <el-form-item label="采购需求单号">
                 <el-input
                 v-model="queryParams.code"
@@ -109,6 +109,9 @@
                 />
               </el-form-item>
             </el-col>
+          </el-row>
+
+          <el-row :gutter="10">
             <el-col :span="1.5">
               <el-form-item label="注册人">
                 <el-input
@@ -129,9 +132,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-
-          <el-row :gutter="10">
             <el-col :span="1.5">
               <el-form-item label="单据来源">
                 <el-select v-model="queryParams.billSource" size="small" style="width: 200px" clearable>
@@ -141,6 +141,9 @@
                 </el-select>
               </el-form-item>
             </el-col>
+          </el-row>
+
+          <el-row :gutter="10">
             <el-col :span="1.5">
               <el-form-item label="需求客户">
                 <el-select size="small" v-model="queryParams.customer" @focus="chooseRefer('CUSTOMER_PARAM', true, '需求客户')" style="width: 200px">
@@ -162,6 +165,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <!-- <el-col :span="1.5">
+              <el-form-item label="转请购时间">
+                <el-select v-model="queryParams.ywlx" size="small" style="width: 200px" clearable>
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col> -->
           </el-row>
 
           <el-row :gutter="10">
@@ -192,18 +207,6 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="1.5">
-              <el-form-item label="转请购时间">
-                <el-select v-model="queryParams.ywlx" size="small" style="width: 200px" clearable>
-                  <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
           </el-row>
 
           <el-row :gutter="10">

src/views/purchase/PurchaseDemandList/add.vue

@@ -63,7 +63,7 @@
          <el-col :span="1.5">
             <el-form-item label="需求人员">
                 <el-select size="small" v-model="basicForm.demandPersonal" :disabled="sonDisable" @focus="chooseOrg('CONTACTS_PARAM', true, '需求人员')" style="width: 200px">
-                  <el-option v-for="item in personOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  <el-option v-for="item in personOptions" :key="item.id" :label="item.name" :value="item.code" />
                 </el-select>
             </el-form-item>
           </el-col>
@@ -364,13 +364,7 @@
           </el-table-column>
           <el-table-column label="默认采购组织" align="center"  prop="purOrgName" width="200px"/>
           <el-table-column label="默认采购组织编码" align="center"  prop="puOrg" width="200px"/>
-          <el-table-column label="末级供应调拨待入量" align="center"  prop="lastStockQty" width="150px">
-            <template slot-scope="scope">
-              <el-form-item class="hang">
-                <el-input :readonly="sonDisable" size="small" v-model="scope.row.lastStockQty"/>
-              </el-form-item>
-            </template>
-          </el-table-column>
+          <!-- <el-table-column label="末级供应调拨待入量" align="center"  prop="lastStockQty" width="150px"/> -->
           <el-table-column label="上级供应中心现存量" align="center"  prop="superiorCenterQty" width="200px"/>
           <el-table-column label="上级库存被调拨占用量" align="center"  prop="superiorAllotQty" width="200px"/>
           <el-table-column label="可用量" align="center"  prop="availableQty"/>
@@ -463,7 +457,7 @@
         <el-button type="primary" size="small" plain @click="save" v-if="sonPageStu == 'add' || sonPageStu == 'edit'">保存</el-button>
       </el-col>
       <el-col :span="1.5" style="margin: 0 10px;">
-        <el-button type="primary" size="small" plain @click="submit" v-if="sonPageStu == 'check'">提交</el-button>
+        <el-button type="primary" size="small" plain @click="submit" v-if="sonPageStu == 'check' && (row.status == '0' || row.status == '3')">提交</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button size="small" plain @click="back">返回</el-button>

src/views/purchase/PurchaseDemandList/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="PurchaseDemandList">
     <div v-if="isList">
-      <el-form class="search_area" label-width="120px">
+      <el-form class="search_area" label-width="100px">
         <el-row :gutter="10">
           <el-col :span="1.5">
             <el-form-item label="单据编码">
@@ -57,9 +57,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row :gutter="10">
           <el-col :span="1.5">
             <el-form-item label="业务类型">
               <el-select clearable v-model="queryParams.billType" size="small" style="width: 200px">
@@ -68,6 +65,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
           <el-col :span="1.5">
             <el-form-item label="需求部门">
               <el-select clearable v-model="queryParams.demandDept" size="small" :disabled="disable" @focus="chooseOrg('DEPT_PARAM', true, '需求部门')" style="width: 200px">

src/views/purchase/transferOrder/add.vue

@@ -520,12 +520,15 @@
     </el-form>
 
     <div class="btn_group">
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" size="small" plain @click="copy" v-if="sonPageStu == 'check'">复制</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="primary" size="small" plain @click="save" v-if="sonPageStu == 'add' || sonPageStu == 'edit'">保存</el-button>
+      </el-col>
       <el-col :span="1.5" style="margin: 0 10px;">
-        <el-button type="primary" size="small" plain @click="save" v-if="pageStu == 'add' || pageStu == 'edit'">保存</el-button>
+        <el-button type="primary" size="small" plain @click="submit" v-if="sonPageStu == 'check' && (row.status == '0' || row.status == '3')">提交</el-button>
       </el-col>
-      <!-- <el-col :span="1.5" style="margin: 0 10px;">
-        <el-button type="primary" size="small" plain @click="submit" v-if="pageStu == 'edit'">提交</el-button>
-      </el-col> -->
       <el-col :span="1.5">
         <el-button size="small" plain @click="back">返回</el-button>
       </el-col>
@@ -539,7 +542,7 @@
 </template>
 
 <script>
-import {addOrder, getOrderDetail, editOrder} from '@/api/purchase/transferOrder.js'
+import {addOrder, getOrderDetail, editOrder, submitOrder} from '@/api/purchase/transferOrder.js'
 import Refers from '@/components/Refers/refers.vue'
 // 用于回显参照框数据
 import { getRefer } from '@/api/purchase/basic.js'
@@ -648,6 +651,21 @@ export default {
     }
   },
   methods: {
+    copy() {
+
+    },
+    submit() {
+      this.basicForm.stAllotMaterialList = this.materialInfo
+      this.basicForm.stAllotReceiveDeliverList = this.receiveInfo
+      this.basicForm.stAllotReceiveExecuteList = this.priceList
+      this.basicForm.stAllotReceiveExpenseList = this.resultList
+      submitOrder(this.basicForm).then(res => {
+        if (res.code === 200) {
+          this.$modal.msgSuccess("提交成功");
+          this.back()
+        }
+      })
+    },
     save() {
       if(this.pageStu == 'add') {
         this.basicForm.stAllotMaterialList = this.materialInfo

src/views/purchase/transferOrder/index.vue

@@ -127,8 +127,8 @@
           >
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="check(scope.row)">查看</el-button>
-            <el-button type="text" size="small" @click="edit(scope.row)">编辑</el-button>
-            <el-button type="text" size="small" @click="deleteids(scope.row)">删除</el-button>
+            <el-button type="text" size="small" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="deleteids(scope.row)">删除</el-button>
           </template>
         </el-table-column>
         </el-table>

vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://172.16.100.107:8080/drp-admin`, //测试
-        // target: `http://test-sy.derom.com/drp-admin`, //测试
+        target: `http://test-sy.derom.com/drp-admin`, //测试
         // target: `http://release-sy.derom.com/drp-admin`, //预发
         // target: `http://sy.derom.com/drp-admin`, //生产
         // target: `http://172.16.63.202:8000/drp-admin`, // D本地
@@ -45,7 +45,7 @@ module.exports = {
         // target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
         // target: `http://172.16.13.47:8000/drp-admin`, //石杨本地
         // target: `http://172.16.13.113:8000/drp-admin`, //DWT本地
-        target: `http://172.16.13.77:8000/drp-admin`, //TQ本地
+        // target: `http://172.16.13.77:8000/drp-admin`, //TQ本地
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",