Merge remote-tracking branch 'origin/dev' into dev

src/views/business/spd/goal_management/AnnualSaleGoal.vue

@@ -290,158 +290,165 @@
         </el-row>
       </el-form>
       <div id="addDetails">
-        <el-row :gutter="10" class="mb8" style="margin-left: 94%">
+        <el-row :gutter="10" class="mb8" style="margin-left: 87%">
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport">导入明细</el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddDetails">增行</el-button>
           </el-col>
         </el-row>
-        <el-table show-summary sum-text="小计" v-loading="loading" :data="annualSaleGoalDetailsList" @selection-change="handleSelectionChange" style="width: 100%; margin-top: 20px">
-          <el-table-column label="序号" type="index" width="70" align="center" fixed />
-          <el-table-column label="销售组织" align="center" width="180" :render-header="addRedStar">
-            <template slot-scope="scope">
-              <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
-                                    referName="ORG_PARAM"
-                                    :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
-                                    :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
-              </el-popover-select-v2>
-            </template>
-          </el-table-column>
-          <el-table-column label="销售区域" align="center" width="180" :render-header="addRedStar">
-            <template slot-scope="scope">
-              <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
-                                    referName="MK_SALESAREA_PARAM"
-                                    :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
-                                    :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售区域">
-              </el-popover-select-v2>
-            </template>
-          </el-table-column>
-          <el-table-column label="客户" align="center" width="180" :render-header="addRedStar">
-            <template slot-scope="scope">
-              <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].custom" title="客户" valueKey="name"
-                                    referName="CUSTOMER_PARAM"
-                                    :dataMapping="{ customCode: 'code', custom: 'name'}"
-                                    :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入客户">
-              </el-popover-select-v2>
-            </template>
-          </el-table-column>
-          <el-table-column label="负责人" align="center" width="180" :render-header="addRedStar">
-            <template slot-scope="scope">
-              <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].creator" title="负责人" valueKey="name"
-                                    referName="CONTACTS_PARAM"
-                                    :dataMapping="{ creatorCode: 'code', creator: 'name'}"
-                                    :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入负责人">
-              </el-popover-select-v2>
-            </template>
-          </el-table-column>
-          <el-table-column label="一级分类" align="center" width="220" :render-header="addRedStar">
-            <template slot-scope="scope">
-              <el-select v-model="annualSaleGoalDetailsList[scope.$index].oneLevelClassify" size="mini" clearable
-                         @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '一级物料分类', scope.$index)"
-                         style="width: 200px">
-                <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="二级分类" align="center" width="220">
-            <template slot-scope="scope">
-              <el-select v-model="annualSaleGoalDetailsList[scope.$index].twoLevelClassify" size="mini" clearable
-                         @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '二级物料分类', scope.$index)"
-                         style="width: 200px">
-                <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="物料" align="center" width="180">
-            <template slot-scope="scope">
-              <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].material" title="物料" valueKey="name"
-                                    referName="MATERIAL_PARAM"
-                                    :dataMapping="{ materialCode: 'code', material: 'name'}"
-                                    :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入物料">
-              </el-popover-select-v2>
-            </template>
-          </el-table-column>
-          <el-table-column label="合计" align="center" prop="totalGoal" width="180">
-            <template slot-scope="scope">
-              <el-input v-model="annualSaleGoalDetailsList[scope.$index].totalGoal" disabled></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column label="一月" align="center" prop="januaryGoal" width="220">
-            <template slot-scope="scope">
-              <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].januaryGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column label="二月" align="center" prop="februaryGoal" width="220">
-            <template slot-scope="scope">
-              <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].februaryGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column label="三月" align="center" prop="marchGoal" width="220">
-            <template slot-scope="scope">
-              <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].marchGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column label="四月" align="center" prop="aprilGoal" width="220">
-            <template slot-scope="scope">
-              <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].aprilGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column label="五月" align="center" prop="mayGoal" width="220">
-            <template slot-scope="scope">
-              <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].mayGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column label="六月" align="center" prop="juneGoal" width="220">
-            <template slot-scope="scope">
-              <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].juneGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column label="七月" align="center" prop="julyGoal" width="220">
-            <template slot-scope="scope">
-              <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].julyGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column label="八月" align="center" prop="augustGoal" width="220">
-            <template slot-scope="scope">
-              <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].augustGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column label="九月" align="center" prop="septemberGoal" width="220">
-            <template slot-scope="scope">
-              <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].septemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column label="十月" align="center" prop="octoberGoal" width="220">
-            <template slot-scope="scope">
-              <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].octoberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column label="十一月" align="center" prop="novemberGoal" width="220">
-            <template slot-scope="scope">
-              <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].novemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column label="十二月" align="center" prop="decemberGoal" width="220">
-            <template slot-scope="scope">
-              <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].decemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDeleteDetails(scope.$index, scope.row)"
-              >删除</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleCopyDetails(scope.row)"
-              >复制</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="年销售目标填报明细" name="annualSaleGoalDetails">
+            <el-table show-summary sum-text="小计" v-loading="loading" :data="annualSaleGoalDetailsList" @selection-change="handleSelectionChange">
+              <el-table-column label="序号" type="index" width="70" align="center" fixed />
+              <el-table-column label="销售组织" align="center" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleOrg" title="销售组织" valueKey="name"
+                                        referName="ORG_PARAM"
+                                        :dataMapping="{ saleOrgCode: 'code', saleOrg: 'name'}"
+                                        :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售组织">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="销售区域" align="center" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].saleZone" title="销售区域" valueKey="name"
+                                        referName="MK_SALESAREA_PARAM"
+                                        :dataMapping="{ saleZoneCode: 'code', saleZone: 'name'}"
+                                        :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入销售区域">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="客户" align="center" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].custom" title="客户" valueKey="name"
+                                        referName="CUSTOMER_PARAM"
+                                        :dataMapping="{ customCode: 'code', custom: 'name'}"
+                                        :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入客户">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="负责人" align="center" width="180" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].creator" title="负责人" valueKey="name"
+                                        referName="CONTACTS_PARAM"
+                                        :dataMapping="{ creatorCode: 'code', creator: 'name'}"
+                                        :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入负责人">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="一级分类" align="center" width="220" :render-header="addRedStar">
+                <template slot-scope="scope">
+                  <el-select v-model="annualSaleGoalDetailsList[scope.$index].oneLevelClassify" size="mini" clearable
+                             @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '一级物料分类', scope.$index)"
+                             style="width: 200px">
+                    <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="二级分类" align="center" width="220">
+                <template slot-scope="scope">
+                  <el-select v-model="annualSaleGoalDetailsList[scope.$index].twoLevelClassify" size="mini" clearable
+                             @focus="chooseTreeReferForDetails('MATERIALCLASSIFY_PARAM', false, '二级物料分类', scope.$index)"
+                             style="width: 200px">
+                    <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column label="物料" align="center" width="180">
+                <template slot-scope="scope">
+                  <el-popover-select-v2 v-model="annualSaleGoalDetailsList[scope.$index].material" title="物料" valueKey="name"
+                                        referName="MATERIAL_PARAM"
+                                        :dataMapping="{ materialCode: 'code', material: 'name'}"
+                                        :source.sync="annualSaleGoalDetailsList[scope.$index]" placeholder="请输入物料">
+                  </el-popover-select-v2>
+                </template>
+              </el-table-column>
+              <el-table-column label="合计" align="center" prop="totalGoal" width="180">
+                <template slot-scope="scope">
+                  <el-input v-model="annualSaleGoalDetailsList[scope.$index].totalGoal" disabled></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="一月" align="center" prop="januaryGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].januaryGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="二月" align="center" prop="februaryGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].februaryGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="三月" align="center" prop="marchGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].marchGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="四月" align="center" prop="aprilGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].aprilGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="五月" align="center" prop="mayGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].mayGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="六月" align="center" prop="juneGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].juneGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="七月" align="center" prop="julyGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].julyGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="八月" align="center" prop="augustGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].augustGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="九月" align="center" prop="septemberGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].septemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="十月" align="center" prop="octoberGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].octoberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="十一月" align="center" prop="novemberGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].novemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="十二月" align="center" prop="decemberGoal" width="220">
+                <template slot-scope="scope">
+                  <el-input-number @change="computeTotalDetails(scope.$index, annualSaleGoalDetailsList[scope.$index])" v-model="annualSaleGoalDetailsList[scope.$index].decemberGoal" :precision="2" :step="0.1" :min="0"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px" fixed="right">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDeleteDetails(scope.$index, scope.row)"
+                  >删除</el-button>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleCopyDetails(scope.row)"
+                  >复制</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
         <div slot="footer" class="dialog-footer" style="margin-left: 88%; margin-top: 1%">
           <el-button type="primary" @click="submitForm" size="medium">确 定</el-button>
           <el-button @click="cancel" size="medium">返 回</el-button>
@@ -653,6 +660,7 @@ export default {
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/goal_management/annualSaleGoal/importData"
       },
+      activeName: 'annualSaleGoalDetails'
     };
   },
   created() {
@@ -1003,7 +1011,7 @@ export default {
     /** 导入按钮操作 */
     handleImport() {
       this.upload.open = true;
-      if (this.open && this.form.id !== null) {
+      if (this.open) {
         this.upload.title = "年销售目标填报明细导入"
         this.upload.url = process.env.VUE_APP_BASE_API + "goal_management/annualSaleGoalDetails/importData/" + this.form.id
       } else {
@@ -1013,7 +1021,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      if (this.open && this.form.id !== null) {
+      if (this.open) {
         this.download('goal_management/annualSaleGoalDetails/importTemplate', {
         }, `annualSaleGoalDetails_${new Date().getTime()}.xlsx`)
       } else {
@@ -1027,11 +1035,21 @@ export default {
     },
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
+      console.log(response);
       this.upload.open = false;
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
       this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
+      if (this.open) {
+        const array = response.data
+        for (const arrayElement of array) {
+          arrayElement.id = null
+          this.annualSaleGoalDetailsList.push(arrayElement)
+        }
+        this.computeTotal()
+      } else {
+        this.getList();
+      }
     },
     // 提交上传文件
     submitFileForm() {

src/views/business/spd/goal_management/AnnualSaleGoalMerge.vue

@@ -145,15 +145,13 @@
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-dropdown @command="handleCommand">
-          <el-button type="primary" size="mini" plain icon="el-icon-upload">
-            导入<i class="el-icon-arrow-down el-icon--right"></i>
-          </el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="importModel">导入模板</el-dropdown-item>
-            <el-dropdown-item command="import">导入</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+        >导入</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-dropdown @command="handleCommand">
@@ -657,6 +655,36 @@
       </div>
     </el-drawer>
 
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
     <TreeRefers ref="treeQuery" @doSubmit="selectionsToInputForQuery" :single="true"/>
     <TreeRefers ref="treeMain" @doSubmit="selectionsToInputForMain" :single="true" />
     <TreeRefers ref="treeDetails" @doSubmit="selectionsToInputForDetails" :single="true" />
@@ -676,6 +704,7 @@ import {
   delAnnualSaleMergeDetails,
   getAnnualSaleMergeDetails
 } from "@/api/business/spd/goal_management/annualSaleMergeDetails"
+import { getToken } from "@/utils/auth";
 
 // 树形参照
 import TreeRefers from '@/components/Refers/treeRefer.vue'
@@ -837,7 +866,22 @@ export default {
         }, {
           label: '二级分类', value: '二级分类'
         }],
-      activeName: 'annualSaleGoalMergeDetails'
+      activeName: 'annualSaleGoalMergeDetails',
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/goal_management/annualSaleGoalMerge/importData"
+      }
     };
   },
   created() {
@@ -1215,7 +1259,6 @@ export default {
       this.$confirm('确认关闭？')
         .then(_ => {
           done();
-          this.resetQuery()
         })
         .catch(_ => {});
     },
@@ -1300,8 +1343,13 @@ export default {
       }
       mergeAnnualSaleMergeDetails(query).then(response => {
         console.log(response);
-        this.annualSaleGoalMergeDetailsList = response.data.consolidatedDetail
-        this.computeTotal()
+        if (response.data.consolidatedDetail.length > 0) {
+          this.annualSaleGoalMergeDetailsList = response.data.consolidatedDetail
+          this.computeTotal()
+        } else {
+          return this.$message.warning('未查到相关数据')
+        }
+
       })
     },
     // 获得区域目标汇总or客户目标汇总
@@ -1352,13 +1400,7 @@ export default {
     },
     handleCommand(command) {
       // 执行对应的功能
-      if (command === 'importModel') {
-        // 执行选项1的功能
-        console.log('导入模板');
-      } else if (command === 'import') {
-        // 执行选项2的功能
-        console.log('导入');
-      } else if (command === 'export') {
+      if (command === 'export') {
         console.log('导出主表');
         this.handleExport()
       } else if (command === 'exportDetails') {
@@ -1371,6 +1413,34 @@ export default {
         console.log('导出客户目标汇总')
         this.handleExportCustomSum()
       }
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.open = true;
+      this.upload.title = "年销售目标合并导入";
+      this.upload.url = process.env.VUE_APP_BASE_API + "goal_management/annualSaleGoalMerge/importData"
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('goal_management/annualSaleGoalMerge/importTemplate', {
+      }, `annualSaleGoalMerge_${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      console.log(response);
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
     }
   }
 };

src/views/business/spd/goal_management/MonthGoalMerge.vue

@@ -160,15 +160,13 @@
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-dropdown @command="handleCommand">
-          <el-button type="primary" size="mini" plain icon="el-icon-upload">
-            导入<i class="el-icon-arrow-down el-icon--right"></i>
-          </el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="importModel">导入模板</el-dropdown-item>
-            <el-dropdown-item command="import">导入</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+        >导入</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-dropdown @command="handleCommand">
@@ -542,6 +540,36 @@
       </div>
     </el-drawer>
 
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
     <TreeRefers ref="treeQuery" @doSubmit="selectionsToInputForQuery" :single="true"/>
     <TreeRefers ref="treeMain" @doSubmit="selectionsToInputForMain" :single="true"/>
     <TreeRefers ref="treeDetails" @doSubmit="selectionsToInputForDetails" :single="true"/>
@@ -561,6 +589,7 @@ import {
   delMonthGoalMergeDetails,
   mergeMonthSaleMergeDetails
 } from "@/api/business/spd/goal_management/monthGoalMergeDetails"
+import { getToken } from "@/utils/auth";
 
 // 树形参照
 import TreeRefers from '@/components/Refers/treeRefer.vue'
@@ -715,7 +744,22 @@ export default {
       // 树形参照
       referCondition: { type: '', isPage: true, title: '', index: null },
       classOptions: [],
-      activeName: 'monthGoalMergeDetails'
+      activeName: 'monthGoalMergeDetails',
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/goal_management/annualSaleGoalMerge/importData"
+      }
     };
   },
   created() {
@@ -1205,8 +1249,12 @@ export default {
       }
       mergeMonthSaleMergeDetails(query).then(response => {
         console.log(response);
-        this.monthGoalMergeDetailsList = response.data.monthGoalMergeDetails
-        this.computeTotal()
+        if (response.data.monthGoalMergeDetails.length > 0) {
+          this.monthGoalMergeDetailsList = response.data.monthGoalMergeDetails
+          this.computeTotal()
+        } else {
+          return this.$message.warning('未查到相关数据')
+        }
       })
     },
     setBeginAndEnd() {
@@ -1270,6 +1318,34 @@ export default {
         this.customGoalSumList = mergedArray
       }
     },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.open = true;
+      this.upload.title = "月销售目标合并导入";
+      this.upload.url = process.env.VUE_APP_BASE_API + "goal_management/monthGoalMerge/importData"
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('goal_management/monthGoalMerge/importTemplate', {
+      }, `monthGoalMerge_${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      console.log(response);
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
   }
 };
 </script>

src/views/business/spd/goal_management/MonthReturnGoal.vue

@@ -295,7 +295,10 @@
         </el-row>
       </el-form>
       <div>
-        <el-row :gutter="10" class="mb8" style="margin-left: 94%">
+        <el-row :gutter="10" class="mb8" style="margin-left: 87%">
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport">导入明细</el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddDetails">增行</el-button>
           </el-col>
@@ -865,7 +868,7 @@ export default {
     /** 导入按钮操作 */
     handleImport() {
       this.upload.open = true;
-      if (this.open && this.form.id !== null) {
+      if (this.open) {
         this.upload.title = "月回款目标填报明细导入"
         this.upload.url = process.env.VUE_APP_BASE_API + "mk/monthReturnGoalDetails/importData/" + this.form.id
       } else {
@@ -875,7 +878,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      if (this.open && this.form.id !== null) {
+      if (this.open) {
         this.download('mk/monthReturnGoalDetails/importTemplate', {
         }, `monthReturnGoalDetails_${new Date().getTime()}.xlsx`)
       } else {
@@ -893,7 +896,16 @@ export default {
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
       this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
+      if (this.open) {
+        let array = response.data
+        for (const arrayElement of array) {
+          arrayElement.id = null
+          this.monthReturnGoalDetailsList.push(arrayElement)
+        }
+        this.computeTotal()
+      } else {
+        this.getList();
+      }
     },
     // 提交上传文件
     submitFileForm() {

src/views/business/spd/goal_management/MonthReturnMerge.vue

@@ -135,15 +135,13 @@
       </el-button>
     </el-col>
     <el-col :span="1.5">
-      <el-dropdown @command="handleCommand">
-        <el-button type="primary" size="mini" plain icon="el-icon-upload">
-          导入<i class="el-icon-arrow-down el-icon--right"></i>
-        </el-button>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="importModel">导入模板</el-dropdown-item>
-          <el-dropdown-item command="import">导入</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+      <el-button
+        type="info"
+        plain
+        icon="el-icon-upload2"
+        size="mini"
+        @click="handleImport"
+      >导入</el-button>
     </el-col>
     <el-col :span="1.5">
       <el-dropdown @command="handleCommand">
@@ -441,6 +439,36 @@
       </div>
     </div>
   </el-drawer>
+
+  <!-- 用户导入对话框 -->
+  <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <el-upload
+      ref="upload"
+      :limit="1"
+      accept=".xlsx, .xls"
+      :headers="upload.headers"
+      :action="upload.url + '?updateSupport=' + upload.updateSupport"
+      :disabled="upload.isUploading"
+      :on-progress="handleFileUploadProgress"
+      :on-success="handleFileSuccess"
+      :auto-upload="false"
+      drag
+    >
+      <i class="el-icon-upload"></i>
+      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+      <div class="el-upload__tip text-center" slot="tip">
+        <div class="el-upload__tip" slot="tip">
+          <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+        </div>
+        <span>仅允许导入xls、xlsx格式文件。</span>
+        <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+      </div>
+    </el-upload>
+    <div slot="footer">
+      <el-button type="primary" @click="submitFileForm">确 定</el-button>
+      <el-button @click="upload.open = false">取 消</el-button>
+    </div>
+  </el-dialog>
 </div>
 </template>
 
@@ -457,6 +485,7 @@ import {
   getMonthReturnMergeDetails,
   mergeMonthReturnMergeDetails
 } from "@/api/business/spd/goal_management/monthReturnMergeDetails"
+import { getToken } from "@/utils/auth";
 
 // 参照
 import TreeRefers from '@/components/Refers/treeRefer.vue'
@@ -585,7 +614,22 @@ export default {
           }
         }]
       },
-      documentDateRange: null
+      documentDateRange: null,
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/goal_management/annualSaleGoalMerge/importData"
+      }
     }
   },
   created() {
@@ -814,7 +858,6 @@ export default {
       this.$confirm('确认关闭？')
         .then(_ => {
           done();
-          this.resetQuery()
         })
         .catch(_ => {});
     },
@@ -831,8 +874,12 @@ export default {
       }
       mergeMonthReturnMergeDetails(this.form).then(response => {
         console.log(response)
-        this.monthReturnMergeDetailsList = response.data.monthReturnMergeDetails
-        this.computeTotal()
+        if (response.data.monthReturnMergeDetails) {
+          this.monthReturnMergeDetailsList = response.data.monthReturnMergeDetails
+          this.computeTotal()
+        } else {
+          return this.$message.warning('未查到相关数据')
+        }
       })
     },
     // 计算主表合计
@@ -910,6 +957,34 @@ export default {
         console.log('导出区域目标汇总');
         this.handleExportZoneSum()
       }
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.open = true;
+      this.upload.title = "月回款目标合并导入";
+      this.upload.url = process.env.VUE_APP_BASE_API + "mk/monthReturnMerge/importData"
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('mk/monthReturnMerge/importTemplate', {
+      }, `monthReturnMerge_${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      console.log(response);
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
     }
   }
 }

src/views/business/spd/goal_management/MonthSaleGoal.vue

@@ -297,7 +297,10 @@
         </el-row>
       </el-form>
       <div>
-        <el-row :gutter="10" class="mb8" style="margin-left: 94%">
+        <el-row :gutter="10" class="mb8" style="margin-left: 87%">
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport">导入明细</el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddDetails">增行</el-button>
           </el-col>
@@ -952,7 +955,7 @@ export default {
     /** 导入按钮操作 */
     handleImport() {
       this.upload.open = true;
-      if (this.open && this.form.id !== null) {
+      if (this.open) {
         this.upload.title = "月销售目标填报明细导入"
         this.upload.url = process.env.VUE_APP_BASE_API + "goal_management/monthSaleGoalDetails/importData/" + this.form.id
       } else {
@@ -962,7 +965,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      if (this.open && this.form.id !== null) {
+      if (this.open) {
         this.download('goal_management/monthSaleGoalDetails/importTemplate', {
         }, `monthSaleGoalDetails_${new Date().getTime()}.xlsx`)
       } else {
@@ -980,7 +983,16 @@ export default {
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
       this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
+      if (this.open) {
+        let array = response.data
+        for (const arrayElement of array) {
+          arrayElement.id = null
+          this.monthSaleGoalDetailsList.push(arrayElement)
+        }
+        this.computeTotal()
+      } else {
+        this.getList();
+      }
     },
     // 提交上传文件
     submitFileForm() {

src/views/purchase/DemandSummary/add.vue

@@ -10,7 +10,8 @@
         <el-button type="primary" size="mini" v-if="lineDisable" @click="reloadBatch">重取批量</el-button>
       </div>
 
-      <el-table 
+      <el-table
+          v-loading="loading"
           :data="tableList" 
           fit
           :cell-style="{ borderColor: '#c0c0c0' }"
@@ -35,7 +36,7 @@
         <el-table-column show-overflow-tooltip label="规格" align="center" prop="specification"/>
         <el-table-column show-overflow-tooltip label="单位" align="center" prop="unit"/>
         <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center" prop="manufacturerName" width="230"/>
-        <el-table-column show-overflow-tooltip label="末级供应仓库存量" align="center" prop="lastWarehouseQty" width="150"/>
+        <!-- <el-table-column show-overflow-tooltip label="末级供应仓库存量" align="center" prop="lastWarehouseQty" width="150"/> -->
         <el-table-column show-overflow-tooltip label="月销量" align="center" prop="totalMonthlySales"/>
         <el-table-column show-overflow-tooltip label="采购周期" align="center" prop="puPeriod"/>
         <el-table-column show-overflow-tooltip label="最终净需求量" align="center" prop="resDemandQty" width="120"/>
@@ -170,6 +171,7 @@ export default {
   },
   data() {
     return{
+      loading: true,
       hangStatus(row) {
         switch (row.status) {
           case '0':
@@ -261,6 +263,10 @@ export default {
         if (res.code === 200) {
           this.tableList = res.data
         }
+      }).then(() => {
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     editLine() {

src/views/purchase/DemandSummary/index.vue

@@ -219,7 +219,8 @@
 
           <!-- <el-button type="primary" size="mini">转请购</el-button> -->
         </div>
-        <el-table 
+        <el-table
+          v-loading="loading"
           :data="tableList" 
           fit
           :cell-style="{ borderColor: '#c0c0c0' }"
@@ -371,6 +372,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       showColumn: {},
       arrs:[],
       tols: {
@@ -571,6 +573,12 @@ export default {
           this.arrs = arrs
           console.log('获取表头数据', arrs)
         }
+      }).then(() => {
+        // 合计不显示重绘
+        this.$refs.table.doLayout()
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     handleSelectionChange(selection) {

src/views/purchase/PurchaseDemandList/add.vue

@@ -161,12 +161,13 @@
         <span>明细信息</span>
         <div>
         <el-button type="primary" size="mini" @click="addLine" v-if="!sonDisable">增行</el-button>
-        <el-button type="primary" size="mini" v-if="!sonDisable" @click="adjustPl">批量调整</el-button>
+        <el-button type="primary" size="mini" v-if="!sonDisable" @click.stop="adjustPl">批量调整</el-button>
         <el-button type="primary" size="mini" v-if="sonPageStu == 'check' || sonPageStu == 'edit'" @click="showReserved">货权预留单</el-button>
         </div>
       </div>
 
       <el-table
+          v-loading="loading"
           v-myscroll
           :data="basicForm.puDemandItemList.slice(0, over)"
           fit
@@ -180,8 +181,9 @@
           style="font-size: 12px;"
           @selection-change="handleSelectionChange"
           :cell-class-name="cellClassName"
+          :row-key="getRowKeys"
         >
-          <el-table-column show-overflow-tooltip type="selection"/>
+          <el-table-column show-overflow-tooltip type="selection" :reserve-selection="true"/>
           <el-table-column show-overflow-tooltip label="序号" type="index" align="center" width="50px"/>
           <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowNo">
             <template slot-scope="scope">
@@ -538,6 +540,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 不能直接改变props传来的值
       sonPageStu: this.pageStu,
       sonDisable: this.disable,
@@ -556,8 +559,10 @@ export default {
         customerName: '',
         customerCode: '',
         customerPrincipal: '',
-        demandPersonal: this.$store.state.user.name,
-        demandDept: this.$store.state.user.deptId,
+        demandPersonal: '',
+        demandPersonalName: '',
+        demandDept: '',
+        demandDeptName: '',
         planType: '1',
         demandDate: '',
         createTime: '',
@@ -629,6 +634,9 @@ export default {
     } else if(this.pageStu == 'edit') {
       this.getDetails(this.row)
     } else if (this.pageStu == 'add') {
+      this.loading = false
+      this.basicForm.demandPersonal = this.$store.state.user.name
+      this.basicForm.demandDept = this.$store.state.user.deptId
       if (this.basicForm.demandPersonal) { this.reBackRefer('CONTACTS_PARAM', this.basicForm.demandPersonal, '需求人员') }
       if (this.basicForm.demandDept) { this.reBackRefer('DEPT_PARAM', this.basicForm.demandDept) }
     }
@@ -999,6 +1007,10 @@ export default {
                  this.isBDXQ = false
               }
             }
+          }).then(() => {
+            this.loading = false
+          }).catch(err => {
+            this.loading = false
           })
         }
       })
@@ -1100,6 +1112,7 @@ export default {
       if(this.referCondition.type == 'CONTACTS_PARAM' && this.referCondition.title == '需求人员') {
         this.personOptions = selection
         this.basicForm.demandPersonal = selection[0].code
+        this.basicForm.demandPersonalName = selection[0].name
       }
       if(this.referCondition.type == 'CONTACTS_PARAM' && this.referCondition.title == '采购员') {
         this.purchaseManOptions = selection
@@ -1118,7 +1131,7 @@ export default {
       }
       if(this.referCondition.type == 'ADDRESS_PARAM' && this.referCondition.title == '收货地址') {
         this.adjust.deliveryAddressName = selection[0].name
-        this.adjust.deliveryAddress = selection[0].id
+        this.adjust.deliveryAddress = selection[0].code
         this.adjust.contacts = selection[0].contactsName
         this.adjust.contactsPhone = selection[0].contactsPhone
         this.adjust.address = selection[0].address
@@ -1126,6 +1139,7 @@ export default {
       if(this.referCondition.type == 'DEPT_PARAM') {
         this.deptOptions = selection
         this.basicForm.demandDept = selection[0].id
+        this.basicForm.demandDeptName = selection[0].name
       }
       if(this.referCondition.title == '选择收货仓库') {
         this.basicForm.puDemandItemList[this.tableIndex].deliveryWarehouse = selection[0].id
@@ -1143,7 +1157,7 @@ export default {
       }
       if(this.referCondition.title == '选择收货地址') {
         this.basicForm.puDemandItemList[this.tableIndex].deliveryAddressName = selection[0].name
-        this.basicForm.puDemandItemList[this.tableIndex].deliveryAddress = selection[0].id
+        this.basicForm.puDemandItemList[this.tableIndex].deliveryAddress = selection[0].code
         this.basicForm.puDemandItemList[this.tableIndex].contacts = selection[0].contactsName
         this.basicForm.puDemandItemList[this.tableIndex].contactsPhone = selection[0].contactsPhone
         this.basicForm.puDemandItemList[this.tableIndex].address = selection[0].address
@@ -1730,6 +1744,7 @@ export default {
         h('span', ' ' + column.label)
       ];
     },
+    // 表格表头标星
     anotherRedStar(h, { column }) {
       if(this.isBDXQ) {
       return [
@@ -1742,13 +1757,18 @@ export default {
         ]; 
       }
     },
+    // 审批
     jumpOA() {
       toOA(this.$store.state.user.name, this.basicForm.flowId).then(res => {
         if(res.code === 200) {
           window.open(res.oaUrl)
         }
       })
-    }
+    },
+    // 解决表格选中了又自动取消的问题
+    getRowKeys(row) {
+      return row.id
+    },
   }
 }
 </script>

src/views/purchase/PurchaseDemandList/index.vue

@@ -159,7 +159,8 @@
           <!-- <el-button type="primary" size="mini">打印</el-button> -->
         </div>
         
-        <el-table 
+        <el-table
+          v-loading="loading"
           :data="tableList" 
           fit
           :cell-style="{ borderColor: '#c0c0c0' }"
@@ -310,6 +311,7 @@ export default {
   dicts: ['sys_processing_mode', 'sys_status', 'sys_bill_source', 'sys_business', 'sys_reserve_ratio', 'sys_period_unit', 'sys_price_type'],
   data() {
     return {
+      loading: true,
       // 导入参数
       upload: {
         // 是否显示弹出层（导入）
@@ -457,6 +459,10 @@ export default {
           this.tableList = res.rows
           this.total = res.total
         }
+      }).then(() => {
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     handleSelectionChange(selection) {

src/views/purchase/task/index.vue

@@ -151,14 +151,14 @@ export default {
         >
         </zp-button>
       </el-button-group>
-      <el-button-group>
+      <!-- <el-button-group>
         <dc-button
           :size="size"
           :page="page"
           :data="params"
           @success="useQuery(params, page)"
         ></dc-button>
-      </el-button-group>
+      </el-button-group> -->
     </div>
     <el-super-table
       v-model="tableData"

src/views/purchase/transferOrder/add.vue

@@ -18,6 +18,19 @@
           </el-col>
 
           <el-col :span="1.5">
+            <el-form-item label="调入库存组织">
+              <el-select clearable :disabled="sonDisable" size="mini" v-model="basicForm.storageInventoryOrg"
+                @clear="clean('调入库存组织')"
+                @change="controlCk('调入库存组织')"
+                @focus="chooseRefer('ORG_PARAM', true, '调入库存组织')"
+                style="width: 200px"
+              >
+                <el-option v-for="item in ruOrgOptions" :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 clearable :disabled="sonDisable || isOrg"
                 size="mini"
@@ -60,19 +73,6 @@
           </el-col>
 
           <el-col :span="1.5">
-            <el-form-item label="调入库存组织">
-              <el-select clearable :disabled="sonDisable" size="mini" v-model="basicForm.storageInventoryOrg"
-                @clear="clean('调入库存组织')"
-                @change="controlCk('调入库存组织')"
-                @focus="chooseRefer('ORG_PARAM', true, '调入库存组织')"
-                style="width: 200px"
-              >
-                <el-option v-for="item in ruOrgOptions" :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 clearable :disabled="sonDisable || isOrg"
                 size="mini"
@@ -285,6 +285,7 @@
             </div>
             
             <el-table
+              v-loading="loading"
               :data="materialInfo"
               fit
               border
@@ -505,7 +506,7 @@
                   <el-form-item class="hang">
                     <el-input
                       clearable
-                      :disabled="sonDisable"
+                      :disabled="sonDisable || isOrg"
                       size="mini"
                       v-model="scope.row.storageDeptName"
                       @clear="cleanMx(scope.$index, '调入部门')"
@@ -521,7 +522,7 @@
                     >
                       <el-button
                         size="mini"
-                        :disabled="sonDisable"
+                        :disabled="sonDisable || isOrg"
                         slot="append"
                         icon="el-icon-more"
                         @click="
@@ -1423,6 +1424,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       // 不能直接改变props传来的值
       sonPageStu: this.pageStu,
       sonDisable: this.disable,
@@ -1476,8 +1478,6 @@ export default {
         title: "",
         // 仓库编码
         stordocId: "",
-      },
-      referConditionMx: {
         orgCode: "",
         materialCode: "",
         unitCode: "",
@@ -1529,6 +1529,8 @@ export default {
       this.getDetails(this.row);
       this.isDRCk = false;
       this.isDCCk = false;
+    } else if (this.pageStu == "add") {
+      this.loading = false
     }
   },
   methods: {
@@ -1764,7 +1766,11 @@ export default {
           // 控制先选调出库存组织和调入库存组织再选调出部门和调入调出仓库
           this.controlCk();
         }
-      });
+      }).then(() => {
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
+      })
     },
     // 回显参照框
     reBackRefer(type, id, title) {
@@ -1888,21 +1894,7 @@ export default {
         this.basicForm.deliveryInventoryOrg = selection[0].id;
         this.basicForm.deliveryInventoryOrgCode = selection[0].code;
         this.basicForm.deliveryInventoryOrgName = selection[0].name;
-        // 清空调出仓库，部门
-        this.basicForm.deliveryWarehouse = "";
-        this.basicForm.deliveryWarehouseCode = "";
-        this.basicForm.deliveryWarehouseName = "";
-        this.basicForm.deliveryDept = "";
-        this.basicForm.deliveryDeptName = "";
-        // 选择调入库存组织时判断调拨方式
-        if (
-          this.basicForm.storageInventoryOrg ==
-          this.basicForm.deliveryInventoryOrg
-        ) {
-          this.basicForm.allotType = "4";
-        } else {
-          this.basicForm.allotType = "2";
-        }
+        this.clearDCZZ()
       }
       if (this.referCondition.title == "调入库存组织") {
         this.ruOrgOptions = selection;
@@ -1910,18 +1902,7 @@ export default {
         this.basicForm.storageInventory = selection[0].code;
         this.basicForm.storageInventoryOrgName = selection[0].name;
         this.basicForm.onRouteAffilliation = selection[0].name;
-        // 选择调入库存组织清空仓库
-        this.basicForm.storageWarehouse = "";
-        this.basicForm.storageWarehouseName = "";
-        // 选择调入库存组织时判断调拨方式
-        if (
-          this.basicForm.storageInventoryOrg ==
-          this.basicForm.deliveryInventoryOrg
-        ) {
-          this.basicForm.allotType = "4";
-        } else {
-          this.basicForm.allotType = "2";
-        }
+        this.clearDRZZ()
       }
       if (this.referCondition.title == "调出业务员") {
         this.manOptions = selection;
@@ -1993,6 +1974,56 @@ export default {
       // 控制先选调出库存组织和调入库存组织再选调出部门和调入调出仓库
       this.controlCk();
     },
+    // 调出库存组织清空相关数据
+    clearDCZZ() {
+      // 清空调出仓库，部门
+      this.basicForm.deliveryWarehouse = "";
+      this.basicForm.deliveryWarehouseCode = "";
+      this.basicForm.deliveryWarehouseName = "";
+      this.basicForm.deliveryDept = "";
+      this.basicForm.deliveryDeptName = "";
+      // 清空调出货位且禁用
+      this.materialInfo.forEach((item) => {
+        item.deliveryAllocation = null;
+        item.deliveryAllocationName = null;
+      });
+      this.isDCCk = true;
+      // 选择调入库存组织时判断调拨方式
+      if (
+        this.basicForm.storageInventoryOrg ==
+        this.basicForm.deliveryInventoryOrg
+      ) {
+        this.basicForm.allotType = "4";
+      } else {
+        this.basicForm.allotType = "2";
+      }
+    },
+    // 调入库存组织清空相关数据
+    clearDRZZ() {
+      // 选择调入库存组织清空仓库
+      this.basicForm.storageWarehouse = "";
+      this.basicForm.storageWarehouseName = "";
+      // 清空调入部门
+      this.materialInfo.forEach((item) => {
+        item.storageDept = null;
+        item.storageDeptName = null;
+      });
+      // 清空调入货位且禁用
+      this.materialInfo.forEach((item) => {
+        item.storageAllocation = null;
+        item.storageAllocationName = null;
+      });
+      this.isDRCk = true
+      // 选择调入库存组织时判断调拨方式
+      if (
+        this.basicForm.storageInventoryOrg ==
+        this.basicForm.deliveryInventoryOrg
+      ) {
+        this.basicForm.allotType = "4";
+      } else {
+        this.basicForm.allotType = "2";
+      }
+    },
     chooseTreeRefer(type, isPage, title) {
       this.referCondition.type = type;
       this.referCondition.isPage = isPage;
@@ -2035,12 +2066,12 @@ export default {
     // 明细行选择批次号
     chooseBatch(index) {
       this.tableIndex = index;
-      this.referConditionMx.orgId = this.basicForm.deliveryInventoryOrg;
-      this.referConditionMx.materialCode =
+      this.referCondition.orgId = this.basicForm.deliveryInventoryOrg;
+      this.referCondition.materialCode =
       this.materialInfo[this.tableIndex].materialCode;
-      this.referConditionMx.unitId = this.materialInfo[this.tableIndex].unit;
-      this.referConditionMx.warehouseId = this.basicForm.deliveryWarehouse;
-      this.$refs.batchRefer.init(this.referConditionMx);
+      this.referCondition.unitId = this.materialInfo[this.tableIndex].unit;
+      this.referCondition.warehouseId = this.basicForm.deliveryWarehouse;
+      this.$refs.batchRefer.init(this.referCondition);
     },
     selectBatch(selection) {
       console.log("选中的批次号", selection);
@@ -2068,14 +2099,10 @@ export default {
     // 选择框彻底清空
     clean(val) {
       if (val == "调出库存组织") {
-        this.basicForm.deliveryInventoryOrg = "";
-        this.basicForm.deliveryInventoryOrgCode = "";
-        this.basicForm.deliveryInventoryOrgName = "";
+        this.clearDCZZ()
       }
       if (val == "调入库存组织") {
-        this.basicForm.storageInventoryOrg = "";
-        this.basicForm.storageInventory = "";
-        this.basicForm.storageInventoryOrgName = "";
+        this.clearDRZZ()
       }
       if (val == "调出业务员") {
         this.basicForm.businessPersonal = "";
@@ -2084,6 +2111,11 @@ export default {
       if (val == "调入仓库") {
         this.basicForm.storageWarehouse = "";
         this.basicForm.storageWarehouseName = "";
+        this.materialInfo.forEach((item) => {
+          item.storageAllocation = null;
+          item.storageAllocationName = null;
+        });
+        this.isDRCk = true
       }
       if (val == "调出仓库") {
         this.basicForm.deliveryWarehouse = "";

src/views/purchase/transferOrder/index.vue

@@ -69,6 +69,7 @@
         </div>
 
         <el-table 
+          v-loading="loading"
           :data="tableList" 
           fit
           :cell-style="{ borderColor: '#c0c0c0' }"
@@ -336,6 +337,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       expanded: false,
       // 页面配置
       isList: true,
@@ -460,6 +462,12 @@ export default {
           this.total = res.total
           this.materialInfo = res.rows[0].stAllotMaterialList
         }
+      }).then(() => {
+        // 合计不显示重绘
+        this.$refs.multipleTable.doLayout()
+        this.loading = false
+      }).catch(err => {
+        this.loading = false
       })
     },
     addOrder() {

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本地
@@ -46,7 +46,7 @@ module.exports = {
         // target: `http://172.16.13.47:8000/drp-admin`, //这是一个美女的本地
         // target: `http://172.16.13.113:8000/drp-admin`, //DWT本地
         // target: `http://172.16.13.21:8000/drp-admin`, //CKF本地
-        target: `http://172.16.13.43:8000/drp-admin`, //lz's localhost
+        // target: `http://172.16.13.43:8000/drp-admin`, //lz's localhost
          // target: `http://127.0.0.1:8000/drp-admin`,
         changeOrigin: true,
         pathRewrite: {