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

src/api/business/spd/bo/statement.js

@@ -11,6 +11,7 @@ export function listBasic(query) {
 
 // 查询商机百分比列表
 export function listProportion(query) {
+  console.log('query',query);
   return request({
     url: '/mk/bo/statement/listCollect',
     method: 'get',

src/api/marketing/dealer-authorization.js

@@ -23,7 +23,7 @@ const insert = (data) => {
 
 // 经销商授权信息列表
 const remove = (params) => {
-// ?id=${params.id}
+  // ?id=${params.id}
   return request({
     url: `/dealer/delete`,
     method: 'get',
@@ -55,6 +55,10 @@ const download = (data) => {
     url: `/dealer/download`,
     method: 'post',
     data,
+    responseType: "blob",
+    headers: {
+      'Content-Type': 'application/json; application/octet-stream'
+    },
   })
 }
 

src/components/PopDialog/index.vue

@@ -56,6 +56,7 @@ export default {
       searchForm: {
         code: '',
         name: '',
+        isSync: '',
         pageNo: 1,
         pageSize: 10,
       },
@@ -82,8 +83,9 @@ export default {
     }
   },
   methods: {
-    init() {
+    init(val) {
       this.visible = true;
+      this.searchForm.isSync = val
       this.$nextTick(() => {
         this.dataListAllSelections = JSON.parse(JSON.stringify(this.selectData));
         this.resetSearch();

src/components/Refers/batchRefer.vue

@@ -112,8 +112,8 @@ export default {
     },
     // 排序
     resetSearch() {
-      this.$refs['searchForm'].resetFields();
-      this.searchForm.pageNo = 1;
+      this.searchForm.pageNo = 1
+      this.searchForm.search = ''
       this.refreshList();
     },
     // 表格选中数据

src/components/Refers/refers.vue

@@ -112,8 +112,8 @@ export default {
     },
     // 排序
     resetSearch() {
-      this.$refs['searchForm'].resetFields();
-      this.searchForm.pageNo = 1;
+      this.searchForm.pageNo = 1
+      this.searchForm.search = ''
       this.refreshList();
     },
     // 表格选中数据

src/utils/request.js

@@ -6,7 +6,6 @@ import errorCode from "@/utils/errorCode";
 import { tansParams, blobValidate } from "@/utils/ruoyi";
 import cache from "@/plugins/cache";
 import { saveAs } from "file-saver";
-import judgeFileFormat from "@/views/material/tools/attachment-file";
 
 let downloadLoadingInstance;
 // 是否显示重新登录

src/views/business/spd/bo/basic/details.vue

@@ -232,7 +232,7 @@ export default {
   //名称
   name: "BoDetails",
   //注册引入的组件
-  components: { TaskList, ContactList, AccessoryList, FileTemplate, Process, DrInputDialog, },
+  components: { TaskList, ContactList, AccessoryList, FileTemplate, Process,},
   //平台枚举
   dicts: [
     "mk_bo_type",
@@ -334,7 +334,7 @@ export default {
             break;
           case '4':
             this.totalRevenue = "医院营收总额";
-            this.estimate = "医院耗材预估值（万元）"
+            this.estimate = "军队医院设备预估额（万元）"
             break;
           case '5':
             this.totalRevenue = "项目总额";

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

@@ -631,7 +631,7 @@ export default {
             break;
           case '4':
             this.totalRevenue = "医院营收总额";
-            this.estimate = "医院耗材预估值（万元）"
+            this.estimate = "军队医院设备预估额（万元）"
             break;
           case '5':
             this.totalRevenue = "项目总额";
@@ -801,8 +801,9 @@ export default {
               this.submitButtonEditStatus = false;
             });
           }
+        }else{
+          this.submitButtonEditStatus = false;
         }
-        this.submitButtonEditStatus = false;
       });
     },
     /** 删除按钮操作 */

src/views/business/spd/bo/basic/process.vue

@@ -308,7 +308,7 @@
               <div>{{dict.label}}</div>
             </div>
           </el-descriptions-item>
-          <el-descriptions-item label="医院耗材预估额（万元）">{{form.hosDiscreetValue}}</el-descriptions-item>
+          <el-descriptions-item label="医院耗材集采预估额（万元）">{{form.hosDiscreetValue}}</el-descriptions-item>
         </el-descriptions>
       </el-tab-pane>
       <!-- 项目立项 -->
@@ -389,8 +389,10 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="医院决策人" prop="hospitalDecisionMaker" >
-                <el-input v-model="form.consumablesBoFlow.hospitalDecisionMaker" />
+                <el-input v-model="form.consumablesBoFlow.hospitalDecisionMaker" v-show="decisionMakerDisplay"/>
+                <el-input :placeholder="form.consumablesBoFlow.hospitalDecisionMaker ? form.consumablesBoFlow.hospitalDecisionMaker[0] + new Array(form.consumablesBoFlow.hospitalDecisionMaker.length).join('*') : ''" v-show="!decisionMakerDisplay"/>
               </el-form-item>
+              <el-button size="mini" type="text" icon="el-icon-view" :disabled="false" @click="decisionMakerDisplay = !decisionMakerDisplay" v-show="!isUpdate"/>
             </el-col>
             <el-col :span="8">
               <el-form-item label="医院决策时间" prop="hospitalDecisionTime" >
@@ -614,8 +616,11 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="医院决策人" prop="hospitalDecisionMaker" >
-                <el-input v-model="form.medicalBoFlow.hospitalDecisionMaker" />
+                <!-- <el-input v-model="form.medicalBoFlow.hospitalDecisionMaker" /> -->
+                <el-input v-model="form.medicalBoFlow.hospitalDecisionMaker" v-show="decisionMakerDisplay"/>
+                <el-input :placeholder="form.medicalBoFlow.hospitalDecisionMaker ? form.medicalBoFlow.hospitalDecisionMaker[0] + new Array(form.medicalBoFlow.hospitalDecisionMaker.length).join('*') : ''" v-show="!decisionMakerDisplay"/>
               </el-form-item>
+              <el-button size="mini" type="text" icon="el-icon-view" :disabled="false" @click="decisionMakerDisplay = !decisionMakerDisplay" v-show="!isUpdate"/>
             </el-col>
             <el-col :span="8">
               <el-form-item label="医院决策时间" prop="hospitalDecisionTime" >
@@ -748,7 +753,7 @@
               <div>{{dict.label}}</div>
             </div>
           </el-descriptions-item>
-          <el-descriptions-item label="医院耗材预估额（万元）">{{form.hosDiscreetValue}}</el-descriptions-item>
+          <el-descriptions-item label="医院设备预估额（万元）">{{form.hosDiscreetValue}}</el-descriptions-item>
         </el-descriptions>
       </el-tab-pane>
       <!-- 项目立项 -->
@@ -978,7 +983,7 @@
               <div>{{dict.label}}</div>
             </div>
           </el-descriptions-item>
-          <el-descriptions-item label="医院耗材预估额（万元）">{{form.hosDiscreetValue}}</el-descriptions-item>
+          <el-descriptions-item label="军队医院设备预估额（万元）">{{form.hosDiscreetValue}}</el-descriptions-item>
         </el-descriptions>
       </el-tab-pane>
       <!-- 项目立项 -->
@@ -1537,6 +1542,8 @@ export default {
       isUpdate:false,
       //跟进记录参数
       behaviorParame:{},
+      //医院决策人是否显示
+      decisionMakerDisplay:false,
     };
   },
   created() {
@@ -1608,6 +1615,7 @@ export default {
     //修改按钮
     modifyButton() {
       this.isUpdate = true;
+      this.decisionMakerDisplay = true;
     },
     //取消按钮
     cancelButton() {

src/views/business/spd/bo/behavior/behaviorList.vue

@@ -292,7 +292,7 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="this.operatingState != 'Browse'">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="this.operatingState != 'Browse'" :disabled="submitButtonEditStatus">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -394,6 +394,8 @@ export default {
       },
       //当前操作状态
       operatingState: '',
+      //确定按钮是否可点
+      submitButtonEditStatus:false,
     };
   },
   created() {
@@ -559,6 +561,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      this.submitButtonEditStatus = true;
       this.$refs["form"].validate(valid => {
         if (valid) {
           let formData = new FormData();
@@ -575,14 +578,18 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.submitButtonEditStatus = false;
             });
           } else {
             addBehavior(formData).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.submitButtonEditStatus = false;
             });
           }
+        }else{
+          this.submitButtonEditStatus = false;
         }
       });
     },

src/views/business/spd/bo/contact/contactList.vue

@@ -35,7 +35,7 @@
           <dict-tag :options="dict.type.mk_bo_power" :value="scope.row.power"/>
         </template>
       </el-table-column>
-      <el-table-column label="业务爱好" align="center" prop="hobby" />
+      <el-table-column label="兴趣爱好" align="center" prop="hobby" />
       <el-table-column label="家庭地址" align="center" prop="address" />
       <el-table-column label="状态" align="center" prop="state" >
         <template slot-scope="scope">
@@ -332,7 +332,7 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="this.operatingState != 'Browse'">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="this.operatingState != 'Browse'" :disabled="submitButtonEditStatus">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -444,6 +444,8 @@ export default {
       operatingState: '',
       //
       activeName: 'first',
+      //确定按钮是否可点
+      submitButtonEditStatus:false,
     };
   },
   created() {
@@ -577,6 +579,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      this.submitButtonEditStatus = true;
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -584,14 +587,18 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.submitButtonEditStatus = false;
             });
           } else {
             addContact(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.submitButtonEditStatus = false;
             });
           }
+        }else{
+          this.submitButtonEditStatus = false;
         }
       });
     },

src/views/business/spd/bo/education/educationList.vue

@@ -122,7 +122,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" :disabled="submitButtonEditStatus">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -203,6 +203,8 @@ export default {
           );
         }
       },
+      //确定按钮是否可点
+      submitButtonEditStatus:false,
     };
   },
   created() {
@@ -283,6 +285,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      this.submitButtonEditStatus = true;
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -290,14 +293,18 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.submitButtonEditStatus = false;
             });
           } else {
             addEducation(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.submitButtonEditStatus = false;
             });
           }
+        }else{
+          this.submitButtonEditStatus = false;
         }
       });
     },

src/views/business/spd/bo/pojpsn/pojpsnList.vue

@@ -152,7 +152,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" :disabled="submitButtonEditStatus">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -231,6 +231,8 @@ export default {
       },
       //职责列表
       mk_bo_pojpsn_job:[],
+      //确定按钮是否可点
+      submitButtonEditStatus:false,
     };
   },
   created() {
@@ -323,6 +325,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      this.submitButtonEditStatus = true;
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
@@ -330,14 +333,18 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.submitButtonEditStatus = false;
             });
           } else {
             addPojpsn(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.submitButtonEditStatus = false;
             });
           }
+        }else{
+          this.submitButtonEditStatus = false;
         }
       });
     },

src/views/business/spd/bo/relationship/relationshipList.vue

@@ -113,7 +113,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" :disabled="submitButtonEditStatus">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -183,7 +183,9 @@ export default {
             trigger: "blur"
           }
         ],
-      }
+      },
+      //确定按钮是否可点
+      submitButtonEditStatus:false,
     };
   },
   created() {
@@ -266,6 +268,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      this.submitButtonEditStatus = true;
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
@@ -273,14 +276,18 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.submitButtonEditStatus = false;
             });
           } else {
             addRelationship(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.submitButtonEditStatus = false;
             });
           }
+        }else{
+          this.submitButtonEditStatus = false;
         }
       });
     },

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

@@ -23,11 +23,17 @@
         />
       </el-form-item>
       <el-form-item label="商机来源" prop="boSource">
-        <el-input
+        <el-select
           v-model="queryParams.boSource"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-option
+            v-for="dict in dict.type.mk_bo_source"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -36,7 +42,7 @@
     </el-form>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="SPD商机" name="0">
-        <el-table :data="boList" >
+        <el-table :data="boList" v-loading="loading">
           <el-table-column label="客户" align="center" prop="customerName" />
           <el-table-column label="部门" align="center" prop="deptName" />
           <el-table-column label="负责人" align="center" prop="principalName" />
@@ -94,7 +100,7 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="耗材集采商机" name="1">
-        <el-table :data="boList" >
+        <el-table :data="boList" v-loading="loading">
           <el-table-column label="客户" align="center" prop="customerName" />
           <el-table-column label="部门" align="center" prop="deptName" />
           <el-table-column label="负责人" align="center" prop="principalName" />
@@ -160,7 +166,7 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="医疗耗材商机" name="2">
-        <el-table :data="boList" >
+        <el-table :data="boList" v-loading="loading">
           <el-table-column label="客户" align="center" prop="customerName" />
           <el-table-column label="部门" align="center" prop="deptName" />
           <el-table-column label="负责人" align="center" prop="principalName" />
@@ -242,7 +248,7 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="医疗设备商机" name="3">
-        <el-table :data="boList" >
+        <el-table :data="boList" v-loading="loading">
           <el-table-column label="客户" align="center" prop="customerName" />
           <el-table-column label="部门" align="center" prop="deptName" />
           <el-table-column label="负责人" align="center" prop="principalName" />
@@ -308,7 +314,7 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="军队医疗设备商机" name="4">
-        <el-table :data="boList" >
+        <el-table :data="boList" v-loading="loading">
           <el-table-column label="客户" align="center" prop="customerName" />
           <el-table-column label="部门" align="center" prop="deptName" />
           <el-table-column label="负责人" align="center" prop="principalName" />
@@ -373,6 +379,72 @@
           </el-table-column>
         </el-table>
       </el-tab-pane>
+      <el-tab-pane label="工程商机" name="5">
+        <el-table :data="boList" v-loading="loading">
+          <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="b500">
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b500">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b500}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="商机审核" align="center" prop="b501" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b501">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b501}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="项目立项" align="center" prop="b502" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b502">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b502}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="考察" align="center" prop="b503" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b503">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b503}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="解决方案" align="center" prop="b504" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b504">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b504}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="投标与签合同" align="center" prop="b505" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b505">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b505}}
+              </dev>
+            </template>
+          </el-table-column>
+          <el-table-column label="完成" align="center" prop="b599" >
+            <template slot-scope="scope">
+              <dev v-if="scope.row.b599">
+                <el-button size="medium" type="text" icon="el-icon-s-flag" />
+                {{scope.row.b599}}
+              </dev>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
     </el-tabs>
 
     <pagination
@@ -390,6 +462,10 @@
 import { listBasic } from "@/api/business/spd/bo/statement";
 
 export default {
+  dicts: [
+    "mk_bo_type",
+    "mk_bo_source",
+  ],
   data() {
     return {
       // 遮罩层
@@ -412,6 +488,7 @@ export default {
       activeName: '0',
       //分页参数
       total:0,
+      loading: true,
     };
   },
   created() {
@@ -429,6 +506,7 @@ export default {
       this.handleClick(e);
     },
     handleClick(e) {
+      this.loading = true;
       console.log('e',e);
       this.queryParams.boType = e.name;
       switch (e.name) {
@@ -438,7 +516,7 @@ export default {
             console.log('this.boList',this.boList);
             for(var i = 0;i < this.boList.length;i++){
               var nodes = this.boList[i].boNodeFlowList;
-              console.log('nodes',nodes);
+              if(!nodes){continue;}
               var nodesfilter = nodes.filter(n => n.code == '0-00');
               if(nodesfilter.length > 0){
                 this.boList[i].b000 = nodesfilter[0].day;
@@ -473,6 +551,7 @@ export default {
             this.boList = response.rows;
             for(var i = 0;i < this.boList.length;i++){
               var nodes = this.boList[i].boNodeFlowList;
+              if(!nodes){continue;}
               var nodesfilter = nodes.filter(n => n.code == '1-00');
               if(nodesfilter.length > 0){
                 this.boList[i].b100 = nodesfilter[0].day;
@@ -511,6 +590,7 @@ export default {
             this.boList = response.rows;
             for(var i = 0;i < this.boList.length;i++){
               var nodes = this.boList[i].boNodeFlowList;
+              if(!nodes){continue;}
               var nodesfilter = nodes.filter(n => n.code == '2-00');
               if(nodesfilter.length > 0){
                 this.boList[i].b200 = nodesfilter[0].day;
@@ -539,6 +619,10 @@ export default {
               if(nodesfilter.length > 0){
                 this.boList[i].b207 = nodesfilter[0].day;
               }
+              nodesfilter = nodes.filter(n => n.code == '2-08');
+              if(nodesfilter.length > 0){
+                this.boList[i].b208 = nodesfilter[0].day;
+              }
               nodesfilter = nodes.filter(n => n.code == '2-99');
               if(nodesfilter.length > 0){
                 this.boList[i].b299 = nodesfilter[0].day;
@@ -553,6 +637,7 @@ export default {
             this.boList = response.rows;
             for(var i = 0;i < this.boList.length;i++){
               var nodes = this.boList[i].boNodeFlowList;
+              if(!nodes){continue;}
               var nodesfilter = nodes.filter(n => n.code == '3-00');
               if(nodesfilter.length > 0){
                 this.boList[i].b300 = nodesfilter[0].day;
@@ -591,6 +676,7 @@ export default {
             this.boList = response.rows;
             for(var i = 0;i < this.boList.length;i++){
               var nodes = this.boList[i].boNodeFlowList;
+              if(!nodes){continue;}
               var nodesfilter = nodes.filter(n => n.code == '4-00');
               if(nodesfilter.length > 0){
                 this.boList[i].b400 = nodesfilter[0].day;
@@ -624,6 +710,45 @@ export default {
             this.loading = false;
           });
           break;
+        case "5":
+          listBasic(this.queryParams).then(response => {
+            this.boList = response.rows;
+            for(var i = 0;i < this.boList.length;i++){
+              var nodes = this.boList[i].boNodeFlowList;
+              if(!nodes){continue;}
+              var nodesfilter = nodes.filter(n => n.code == '5-00');
+              if(nodesfilter.length > 0){
+                this.boList[i].b500 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '5-01');
+              if(nodesfilter.length > 0){
+                this.boList[i].b501 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '5-02');
+              if(nodesfilter.length > 0){
+                this.boList[i].b502 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '5-03');
+              if(nodesfilter.length > 0){
+                this.boList[i].b503 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '5-04');
+              if(nodesfilter.length > 0){
+                this.boList[i].b504 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '5-05');
+              if(nodesfilter.length > 0){
+                this.boList[i].b505 = nodesfilter[0].day;
+              }
+              nodesfilter = nodes.filter(n => n.code == '5-99');
+              if(nodesfilter.length > 0){
+                this.boList[i].b599 = nodesfilter[0].day;
+              }
+            }
+            this.total = response.total;
+            this.loading = false;
+          });
+          break;
         default:
           break;
       }

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

@@ -1,18 +1,18 @@
 <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="code">
+      <el-form-item label="商机日期" prop="yearMonth">
         <el-date-picker
           type="month"
           v-model="queryParams.yearMonth"
           placeholder="选择月份"
+          @change="yearMonthChange"
           >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="商机类型" prop="boType">
         <el-select
           v-model="queryParams.boType"
-          @change="boTypeChange"
           clearable
         >
           <el-option
@@ -105,7 +105,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        yearMonth: null,
+        yearMonth: new Date().Format(),
         boType: null,
         boSource: null,
         deptName: null,
@@ -127,10 +127,10 @@ export default {
       listProportion(this.queryParams).then(response => {
         this.list = response.rows;
         for(let item of this.list) {
-          if(item.passAuditRate){item.passAuditRate = (item.passAuditRate * 100) + '%';}
-          if(item.approveInitiateProjectRate){item.approveInitiateProjectRate = (item.approveInitiateProjectRate * 100) + '%';}
-          if(item.hangingRate){item.hangingRate = (item.hangingRate * 100) + '%';}
-          if(item.contractSigningRate){item.contractSigningRate = (item.contractSigningRate * 100) + '%';}
+          if(item.passAuditRate){item.passAuditRate = this.accMul(item.passAuditRate,100) + '%';}
+          if(item.approveInitiateProjectRate){item.approveInitiateProjectRate = this.accMul(item.approveInitiateProjectRate,100) + '%';}
+          if(item.hangingRate){item.hangingRate = this.accMul(item.hangingRate , 100) + '%';}
+          if(item.contractSigningRate){item.contractSigningRate = this.accMul(item.contractSigningRate , 100) + '%';}
         }
         this.total = response.total;
         this.loading = false;
@@ -160,13 +160,13 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      console.log('this.queryParams',this.queryParams);
       this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.yearMonth = new Date().Format();
       this.handleQuery();
     },
     // 多选框选中数据
@@ -226,7 +226,17 @@ export default {
       this.download('pu/job/export', {
         ...this.queryParams
       }, `job_${new Date().getTime()}.xlsx`)
-    }
+    },
+    accMul(arg1,arg2){
+      var m=0,s1=arg1.toString(),s2=arg2.toString();
+      try{m+=s1.split(".")[1].length}catch(e){}
+      try{m+=s2.split(".")[1].length}catch(e){}
+      return Number(s1.replace(".",""))*Number(s2.replace(".",""))/Math.pow(10,m)
+    },
+    //选月份后
+    yearMonthChange(value) {
+      this.queryParams.yearMonth = value.Format();
+    },
   }
 };
 </script>

src/views/business/spd/bo/task/taskList.vue

@@ -402,6 +402,7 @@
           type="primary"
           @click="submitForm"
           v-if="this.operatingState != 'Browse'"
+          :disabled="submitButtonEditStatus"
           >确 定</el-button
         >
         <el-button @click="cancel">取 消</el-button>
@@ -564,6 +565,8 @@ export default {
           );
         }
       },
+      //确定按钮是否可点
+      submitButtonEditStatus:false,
     };
   },
   created() {
@@ -683,21 +686,27 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      this.submitButtonEditStatus = true;
       this.$refs["form"].validate((valid) => {
+        console.log('valid',valid);
         if (valid) {
           if (this.form.id != null) {
             updateTask(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.submitButtonEditStatus = false;
             });
           } else {
             addTask(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.submitButtonEditStatus = false;
             });
           }
+        }else{
+          this.submitButtonEditStatus = false;
         }
       });
     },

src/views/marketing/dealer-authorization/authprivAdd.vue

@@ -106,19 +106,22 @@ export default {
           // 校验通过
           let isTime = this.formData.time && this.formData.time != '' && this.formData.time.length;
 
-          const { name, id, } = this.$store.state.user;
+          // name:工号   nickName:名字
+          const { name, nickName } = this.$store.state.user;
 
           let params = {
             ...this.formData,
             startTime: isTime ? this.formData.time[0] : '',
             endTime: isTime ? this.formData.time[1] : '',
-            updatePerson: name,
-            updateTime: new Date().Format('yyyy-MM-dd HH:mm:ss'),
+            updatePerson: nickName,
+            updateBy: name,
+            updateTime: new Date().Format(),
             ...(
               this.isAdd ? {
                 status: '0',
-                createPerson: name,
-                createTime: new Date().Format('yyyy-MM-dd HH:mm:ss'),
+                createPerson: nickName,
+                createBy: name,
+                createTime: new Date().Format(),
               } : {}
             )
 
@@ -128,9 +131,11 @@ export default {
 
           try {
             this.loading = true;
-            let { code, msg } = await (this.isAdd ?
-              dealerApi.insert(params) :
-              dealerApi.update(params))
+            let { code, msg } = await (
+              this.isAdd ?
+                dealerApi.insert(params) :
+                dealerApi.update(params)
+            )
 
             if (code === 200) {
               this.handleCancel();

src/views/marketing/dealer-authorization/authprivSee.vue

@@ -3,14 +3,17 @@
   <el-dialog title="查看" :visible.sync="visible" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="formData" label-position="left" label-width="120px">
       <el-form-item v-for="column in formColumns" :label="column.title" :prop="column.key">
-        <el-input v-if="column.type == 'Input'" readonly v-model="formData[column.key]" autocomplete="off"></el-input>
+        <el-input v-if="column.type == 'Input'" readonly v-model="formData[column.key]" autocomplete="off">
+        </el-input>
 
         <el-date-picker v-if="column.type == 'DateRange'" readonly v-model="formData[column.key]" type="daterange"
           format="yyyy-MM-dd " value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期"
-          end-placeholder="结束日期"></el-date-picker>
+          end-placeholder="结束日期">
+        </el-date-picker>
 
         <el-date-picker v-if="column.type == 'Date'" readonly v-model="formData[column.key]" type="date"
-          format="yyyy-MM-dd " value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+          format="yyyy-MM-dd " value-format="yyyy-MM-dd" placeholder="选择日期">
+        </el-date-picker>
 
       </el-form-item>
     </el-form>
@@ -46,13 +49,13 @@ export default {
 
       if (data.id) {
 
-        let objData = { ...data };
+        this.formData = {
 
-        objData['time'] = [objData.startTime, objData.endTime];
+          ...data,
 
-        // delete data.startTime
-        // delete data.endTime
-        this.formData = objData;
+          time: [data.startTime, data.endTime]
+
+        };
 
       }
 

src/views/marketing/dealer-authorization/index.vue

@@ -41,7 +41,7 @@
         <el-button size="mini" type="primary" @click="handleOpenAddDialog"
           v-hasPermi="['pu:authorization:add']">新增</el-button>
         <!-- <el-button size="mini" @click="handleSubmit">提交</el-button> -->
-        <el-button size="mini" @click="handleDownload">下载授权书</el-button>
+        <!-- <el-button size="mini" @click="handleDownload">下载授权书</el-button> -->
       </el-col>
     </el-row>
 
@@ -59,6 +59,7 @@
       <el-table-column fixed="right" label="操作" width="120">
         <template slot-scope="scope">
           <el-button type="text" size="mini" @click="handleOpenAddDialog(scope.row)"
+            v-if="scope.row.status == '0' || scope.row.status == '3'"
             v-hasPermi="['pu:authorization:edit']">编辑</el-button>
           <el-button type="text" size="mini" @click="handleDelDialog(scope.row)"
             v-if="scope.row.status == '0' || scope.row.status == '3'"
@@ -66,6 +67,8 @@
           <!-- <el-button @click="handleOpenSeeDialog(scope.row)" type="text" size="small">查看</el-button> -->
           <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'"
             @click="handleSubmit(scope.row)">提交</el-button>
+          <el-button type="text" size="mini" v-if="scope.row.status == '2'"
+            @click="handleDownload(scope.row)">下载授权书</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -128,17 +131,18 @@ export default {
       delete params['time']
       console.log(params, 'params--------');
 
-      await dealerApi.list(params).then(res => {
-        console.log(res, '获取列表');
-        let { code, rows, total } = res;
-        this.loading = false;
+      try {
+        let { code, rows, total } = await dealerApi.list(params);
         if (code == 200) {
           this.tableData = rows;
           this.page.total = total;
         }
-      }).catch(error => {
+      } catch (error) {
+        console.log(error);
+      } finally {
         this.loading = false;
-      })
+      }
+
     },
     // 重置
     handelResetSearch() {
@@ -230,45 +234,76 @@ export default {
       });
 
     },
-    // 提交
-    handleSubmit(row) {
+    // 提交OA
+    async handleSubmit(row) {
+      try {
+        // name:工号   nickName:名字
+        const { name, nickName } = this.$store.state.user;
+
+        const { id, authorizedProductsCode,dealerName,authorizedProductsName,authorizedAreaName   } = row;
+
+        let data = {
+          authorizedProductsCode,
+          id,
+          createPerson: nickName,
+          createBy: name,
+          date: new Date().Format(),
+          dealerName,
+          authorizedProductsName,
+          authorizedAreaName
+        }
 
-      console.log(row, '提交');
-      let params = {
-        id: '',
-        status: ''
-      }
-      // try {
-      //   this.loading = true;
-      //   let { code, msg } = await dealerApi.submitOA();
-      //   if (code == 200) {
-      //     this.handleRefresh();
-      //   }
-      // } catch (error) {
-      //   console.log(error);
-      // } finally {
-      //   this.loading = false;
+        this.loading = true;
+        let { code, msg } = await dealerApi.submitOA(data);
+        if (code == 200) {
+          this.handleRefresh();
+        }
+      } catch (error) {
+        console.log(error);
+      } finally {
+        this.loading = false;
 
-      // }
+      }
 
 
 
     },
     // 下载
-    handleDownload() {
-      console.log('下载');
-      // try {
-      //   let { code, msg } = await dealerApi.download();
-      //   if (code == 200) {
-      //   }
-      // } catch (error) {
-      //   console.log(error);
-      // } finally {}
+    async handleDownload(row) {
+      console.log('下载', row);
+      try {
+        const { id, authorizedProductsCode, dealerName, authorizedAreaName, authorizedProductsName } = row;
+
+        const data = {
+          dealerName,
+          authorizedAreaName,
+          authorizedProductsName,
+          id,
+          authorizedProductsCode,
+        }
+
+        // await this.download('/dealer/download', data, `授权书${new Date().getTime()}.doc`);
+        let file = await dealerApi.download(data)
+        let blob = new Blob([file], {
+          type: `application/msword` //word文档为msword,pdf文档为pdf，msexcel 为excel
+        });
+        let objectUrl = URL.createObjectURL(blob);
+        let link = document.createElement("a");
+        let fname = `授权书.doc`; //下载文件的名字+后缀名
+        link.href = objectUrl;
+        link.setAttribute("download", fname);
+        document.body.appendChild(link);
+        link.click();
+
+      } catch (error) {
+        console.log(error);
+      } finally { }
     },
 
   },
   created() {
     this.handelSearch();
+    console.log(this.$store.state.user, 'this.$store.state.user');
   }
 
 }

src/views/marketing/utils/date.js

@@ -5,18 +5,18 @@
 // (new Date()).Format("yyyy-MM-dd hh:mm:ss.S") ==> 2006-07-02 08:09:04.423 
 // (new Date()).Format("yyyy-M-d h:m:s.S")      ==> 2006-7-2 8:9:4.18 
 
-Date.prototype.Format = function (fmt) {
+Date.prototype.Format = function (fmt = 'yyyy-MM-dd HH:mm:ss') {
   var o = {
-      "M+": this.getMonth() + 1, //月份 
-      "d+": this.getDate(), //日 
-      "H+": this.getHours(), //小时 
-      "m+": this.getMinutes(), //分 
-      "s+": this.getSeconds(), //秒 
-      "q+": Math.floor((this.getMonth() + 3) / 3), //季度 
-      "S": this.getMilliseconds() //毫秒 
+    "M+": this.getMonth() + 1, //月份 
+    "d+": this.getDate(), //日 
+    "H+": this.getHours(), //小时 
+    "m+": this.getMinutes(), //分 
+    "s+": this.getSeconds(), //秒 
+    "q+": Math.floor((this.getMonth() + 3) / 3), //季度 
+    "S": this.getMilliseconds() //毫秒 
   };
   if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
   for (var k in o)
-  if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
   return fmt;
 }

src/views/monitor/job/log.vue

@@ -145,13 +145,6 @@
         align="center"
         prop="nickName"
       />
- <el-table-column
-        label="任务员工编号"
-        width="80"
-        align="center"
-        prop="enpno"
-      />
-
       <el-table-column
         label="任务大类"
         width="80"
@@ -396,17 +389,35 @@ export default {
             const { executionTime, createTime, duration } = item;
 
             const durations=`${duration}h`;
+            let tqaaaa  = null;
 
-            const tqaaaa = (
+
+            if(executionTime != null){
+              tqaaaa = (
+                parseInt (
+                  new Date(executionTime).getTime() - new Date(createTime).getTime()
+                ) /
+                1000 /
+                60 /
+                60
+              ).toFixed(2);
+            }
+            
+
+            /** 用于计算超时时长 */
+             const calculateTime = (
               parseInt (
-                new Date(executionTime).getTime() - new Date(createTime).getTime()
+                new Date(executionTime == null ? Date(): executionTime).getTime() - new Date(createTime).getTime()
               ) /
               1000 /
               60 /
               60
-            ).toFixed(2)+'h';
-            const tqbbbb =
-              tqaaaa - duration > 0 ? `超时${tqaaaa - duration}h` : `未超时`;
+            ).toFixed(2);
+
+            /** 计算超时时长 */
+            const timestemp = (calculateTime - duration).toFixed(2)  ;
+
+            const tqbbbb = timestemp > 0 ? `超时 ${timestemp}h` : `未超时`;
 
             return {
               ...item,

src/views/purchase/DemandSummary/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="checkDemandSummary">
     <el-card>
-      <span>采购需求汇总详情</span>
+      <span>采购需求处理详情</span>
       <div class="btn_grooup">
         <el-button type="primary" size="small" @click="editLine">编辑</el-button>
         <el-button type="success" size="small" v-if="!lineDisable" @click="saveLine">保存</el-button>

src/views/purchase/DemandSummary/index.vue

@@ -468,9 +468,9 @@ export default {
       lastAllocationOptions: [],
       orgOptions: [],
       options: [{
-        value: '0', label: '是',
+        value: 'Y', label: '是',
       }, {
-        value: '2', label: '否'
+        value: 'N', label: '否'
       }],
       referCondition: {
         type: '',

src/views/purchase/MaterialClassDivision/add.vue

@@ -160,7 +160,7 @@
          <el-col :span="1.5">
             <el-form-item label="订单部门">
               <el-input
-                v-model="basicForm.orderDept"
+                v-model="basicForm.orderDeptName"
                 size="small"
                 disabled
                 style="width: 200px"
@@ -192,7 +192,7 @@
           <el-col :span="1.5">
             <el-form-item label="采购部门">
               <el-input
-                v-model="basicForm.puDept"
+                v-model="basicForm.puDeptName"
                 size="small"
                 disabled
                 style="width: 200px"
@@ -307,7 +307,9 @@ export default {
         remark: ''
       },
       options: [{
-        value: 0, label: '仓库1'
+        value: 'Y', label: '是',
+      }, {
+        value: 'N', label: '否'
       }],
       referCondition: {
         type: '',

src/views/purchase/MaterialClassDivision/index.vue

@@ -319,7 +319,9 @@ export default {
         pageSize: 5
       },
       options: [{
-        value: 0, label: '仓库1'
+        value: 'Y', label: '是',
+      }, {
+        value: 'N', label: '否'
       }],
       staffOptions: [],
       staff2Options: [],

src/views/purchase/PurchaseDemandList/add.vue

@@ -85,7 +85,7 @@
             <el-form-item label="需求日期">
               <el-date-picker
                 v-model="basicForm.demandDate"
-                disabled
+                :disabled="sonDisable"
                 type="date"
                 value-format="yyyy-MM-dd"
                 size="small"
@@ -104,22 +104,6 @@
             </el-form-item>
          </el-col>
 
-          <el-col :span="1.5">
-            <el-form-item label="供应仓库">
-              <el-select size="small" v-model="basicForm.warehouse" :disabled="sonDisable" @focus="chooseOrg('WAREHOUSE_PARAM', true, '供应仓库')" style="width: 200px">
-                <el-option v-for="item in houseOptions" :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="basicForm.goodsAllocation" :disabled="sonDisable" @focus="chooseOrg('ALLOCATION_PARAM', true, '供应货位')" style="width: 200px">
-                <el-option v-for="item in goodsOptions" :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 v-model="basicForm.billType" :disabled="sonDisable" size="small" style="width: 200px">
@@ -151,20 +135,9 @@
          </el-col> -->
 
           <el-col :span="1.5">
-            <el-form-item label="是否月销量计算">
-              <el-input
-                v-model="basicForm.isMonthleyCalculate"
-                size="small"
-                disabled
-                style="width: 200px"
-              />
-            </el-form-item>
-         </el-col>
-
-          <el-col :span="1.5">
             <el-form-item label="备注">
               <el-input
-                v-model="basicForm.remark"
+                v-model.trim="basicForm.remark"
                 size="small"
                 :disabled="sonDisable"
                 clearable
@@ -193,22 +166,9 @@
           <el-table-column label="序号" type="index" align="center"/>
           <el-table-column label="行状态" align="center" prop="status" :formatter="hangStatus"/>
           <el-table-column label="行号" align="center" prop="rowNo" />
-          <el-table-column label="业务部门名称" align="center" width="180px">
-            <template slot-scope="scope">
-              <el-form-item class="hang">
-                <el-input readonly size="small" v-model="scope.row.businessDeptName"/>
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column label="业务部门" align="center" width="180px">
-            <template slot-scope="scope">
-              <el-form-item class="hang">
-                <el-input readonly size="small" v-model="scope.row.businessDept">
-                <!-- <el-button :disabled="sonDisable" slot="append" icon="el-icon-more" @click="chooseDept(scope.$index, 'DEPT_PARAM', true, '选择部门')"></el-button> -->
-                </el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
+          <!-- <el-table-column label="业务部门名称" align="center" width="180px"/> -->
+          <!-- <el-table-column label="业务部门" align="center" width="180px"/> -->
+          <el-table-column label="需求客户" align="center"  prop="customerName"/>
           <el-table-column label="一级品类" align="center" prop="materialClassifyOneName" width="180px">
             <template slot-scope="scope">
               <el-form-item class="hang">
@@ -367,15 +327,6 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="末级供应仓库" align="center"  prop="lastWarehouseName" width="200px">
-            <template slot-scope="scope">
-              <el-form-item class="hang">
-                <el-input readonly size="small" v-model="scope.row.lastWarehouseName">
-                  <el-button size="small" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="chooseDept(scope.$index, 'WAREHOUSE_PARAM', true, '选择末级供应仓库')"></el-button>
-                </el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
           <el-table-column label="收货仓库" align="center"  prop="deliveryWarehouseName" width="200px">
             <template slot-scope="scope">
               <el-form-item class="hang">
@@ -385,25 +336,18 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="末级供应货位" align="center"  prop="lastAllocationName" width="200px">
-            <template slot-scope="scope">
-              <el-form-item class="hang">
-                <el-input readonly size="small" v-model="scope.row.lastAllocationName">
-                  <el-button size="small" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="chooseDept(scope.$index, 'ALLOCATION_PARAM', true, '选择末级供应货位')"></el-button>
-                </el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column label="收货货位编码" align="center"  prop="deliveryAllocation" width="200px"/>
           <el-table-column label="收货货位" align="center"  prop="deliveryAllocationName" width="200px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input readonly size="small" v-model="scope.row.deliveryAllocationName">
-                  <el-button size="small" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="chooseDept(scope.$index, 'ALLOCATION_PARAM', true, '选择收货货位')"></el-button>
+                  <el-button size="small" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="choosehuoWei(scope.$index, 'ALLOCATION_PARAM', true, '选择收货货位', scope.row.deliveryWarehouse)"></el-button>
                 </el-input>
               </el-form-item>
             </template>
           </el-table-column>
+          <!-- <el-table-column label="收货货位编码" align="center"  prop="deliveryAllocation" width="200px"/> -->
+          <el-table-column label="末级供应仓库" align="center"  prop="lastWarehouseName" width="200px"/>
+          <el-table-column label="末级供应货位" align="center"  prop="lastAllocationName" width="200px"/>
           <el-table-column label="紧急标识" align="center" prop="isUrgency" width="100px">
             <template slot-scope="scope">
               <el-form-item class="hang">
@@ -471,13 +415,6 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="需求客户" align="center"  prop="customer">
-            <template slot-scope="scope">
-              <el-form-item class="hang">
-                <el-input v-model="scope.row.customer"/>
-              </el-form-item>
-            </template>
-          </el-table-column> -->
           <el-table-column label="末级供应库存组织" align="center" prop="superiorStockOrgName" width="200px"></el-table-column>
           <el-table-column label="中心仓可用量" align="center"  prop="updateTime" width="200px"></el-table-column>
           <el-table-column label="调拨单号" align="center"  prop="allotCode"></el-table-column>
@@ -584,9 +521,7 @@ export default {
         demandPersonal: '',
         demandDept: '',
         demandDate: '',
-        source: '1',
-        warehouse: '',
-        goodsAllocation: '',
+        source: '4',
         billType: '',
         isSpeical: '',
         isProcess: '',
@@ -595,30 +530,27 @@ export default {
         puDemandItemList: []
       },
       options: [{
-        value: '0', label: '是',
+        value: 'Y', label: '是',
       }, {
-        value: '2', label: '否'
+        value: 'N', label: '否'
       }],
       basicRules: {},
       tableList: [],
       referCondition: {
-        type: 'ORG_PARAM',
+        type: '',
         isPage: true,
-        title: '选择组织',
-        pkOrg: '',
+        title: '',
       },
       referConditionMx: {
-        type: 'DEPT_PARAM',
+        type: '',
         isPage: true,
-        title: '选择部门'
+        title: '',
       },
       tableIndex: null,
       orgOptions: [],
       personOptions: [],
       deptOptions: [],
       customerOptions: [],
-      houseOptions: [],
-      goodsOptions: []
     }
   },
   created() {
@@ -706,6 +638,8 @@ export default {
         status: null,
         businessDept: null,
         businessDeptName: null,
+        customer: this.basicForm.customer,
+        customerName: this.basicForm.customerName,
         materialCategory: null,
         buyer: null,
         buyerName: null,
@@ -800,6 +734,8 @@ export default {
         delFlag: null,
         // 新增字段
         model: null,
+        storageCondition: null,
+        transportationCondition: null,
       }
       this.basicForm.puDemandItemList.push(newLine)
     },
@@ -834,10 +770,8 @@ export default {
               if(this.basicForm.customer) { this.reBackRefer('CUSTOMER_PARAM', this.basicForm.customer) }
               if(this.basicForm.demandPersonal) { this.reBackRefer('CONTACTS_PARAM', this.basicForm.demandPersonal) }
               if(this.basicForm.demandDept) { this.reBackRefer('DEPT_PARAM', this.basicForm.demandDept) }
-              if(this.basicForm.warehouse) { this.reBackRefer('WAREHOUSE_PARAM', this.basicForm.warehouse) }
-              if(this.basicForm.goodsAllocation) { this.reBackRefer('ALLOCATION_PARAM', this.basicForm.goodsAllocation) }
+              // 详情时将收货仓库id赋值给stordocId
             }
-            console.log('111')
           })
         }
       })
@@ -866,20 +800,12 @@ export default {
         if (type == 'DEPT_PARAM') {
           this.deptOptions = res.rows
         }
-        if (type == 'WAREHOUSE_PARAM') {
-          this.houseOptions = res.rows
-        }
-        if (type == 'ALLOCATION_PARAM') {
-          this.goodsOptions = res.rows
-        }
       })
     },
     chooseOrg(type, isPage, title) {
       this.referCondition.type = type
       this.referCondition.isPage = isPage
       this.referCondition.title = title
-      // 选择货位时要传入组织id
-      this.referCondition.pkOrg = this.basicForm.org
       this.$refs.refer.init(this.referCondition)
     },
     selectionsToInput(selection) {
@@ -902,29 +828,16 @@ export default {
         this.deptOptions = selection
         this.basicForm.demandDept = selection[0].id
       }
-      if(this.referCondition.type == 'WAREHOUSE_PARAM') {
-        this.houseOptions = selection
-        this.basicForm.warehouse = selection[0].id
-      }
-      if(this.referCondition.type == 'ALLOCATION_PARAM') {
-        this.goodsOptions = selection
-        this.basicForm.goodsAllocation = selection[0].id
-      }
       // if(this.referConditionMx.type == 'DEPT_PARAM') {
       //   this.basicForm.puDemandItemList[this.tableIndex].businessDept = selection[0].code
       //   this.basicForm.puDemandItemList[this.tableIndex].businessDeptName = selection[0].name
       // }
-      if(this.referConditionMx.title == '选择末级供应仓库') {
-        this.basicForm.puDemandItemList[this.tableIndex].lastWarehouseName = selection[0].name
-      }
       if(this.referConditionMx.title == '选择收货仓库') {
+        this.basicForm.puDemandItemList[this.tableIndex].deliveryWarehouse = selection[0].id
         this.basicForm.puDemandItemList[this.tableIndex].deliveryWarehouseName = selection[0].name
       }
-      if(this.referConditionMx.title == '选择末级供应货位') {
-        this.basicForm.puDemandItemList[this.tableIndex].lastAllocationName = selection[0].name
-      }
       if(this.referConditionMx.title == '选择收货货位') {
-        this.basicForm.puDemandItemList[this.tableIndex].deliveryAllocation = selection[0].code
+        this.basicForm.puDemandItemList[this.tableIndex].deliveryAllocation = selection[0].id
         this.basicForm.puDemandItemList[this.tableIndex].deliveryAllocationName = selection[0].name
       }
       if(this.referConditionMx.title == '选择补单供应商') {
@@ -943,7 +856,8 @@ export default {
     chooseMaterial(index) {
       console.log("🚀 ~ file: add.vue:790 ~ chooseMaterial ~ index:", index)
       this.tableIndex = index
-      this.$refs.materialRefer.init()
+      // 传0只展示同步NC了的物料
+      this.$refs.materialRefer.init(0)
     },
     selectMaterial(selection) {
       console.log('选中的物料', selection)
@@ -979,6 +893,9 @@ export default {
       this.basicForm.puDemandItemList[this.tableIndex].safeStock = selection[0].safeStock
       this.basicForm.puDemandItemList[this.tableIndex].purOrgName = selection[0].purchasingOrganizationName
       this.basicForm.puDemandItemList[this.tableIndex].puOrg = selection[0].purchasingOrganization
+      // 物料存储条件和运输条件
+      this.basicForm.puDemandItemList[this.tableIndex].transportationCondition = selection[0].transportationCondition
+      this.basicForm.puDemandItemList[this.tableIndex].storageCondition = selection[0].storageCondition
     },
     // 明细行选择业务部门参照带出业务部门数据
     chooseDept(index, type, isPage, title) {
@@ -987,6 +904,20 @@ export default {
       this.referConditionMx.isPage = isPage
       this.referConditionMx.title = title
       this.$refs.refer.init(this.referConditionMx)
+    },
+    // 明细行选择业务部门参照带出业务部门数据
+    choosehuoWei(index, type, isPage, title, stordocId) {
+      this.tableIndex = index
+      this.referConditionMx.type = type
+      this.referConditionMx.isPage = isPage
+      this.referConditionMx.title = title
+      // 选择收货货位前先选择收货仓库
+      if(stordocId) {
+        this.referConditionMx.stordocId = stordocId
+        this.$refs.refer.init(this.referConditionMx)
+      } else {
+        this.$modal.msgWarning("请先选择收货仓库");
+      }
     }
   }
 }

src/views/purchase/PurchaseDemandList/index.vue

@@ -6,29 +6,23 @@
           <el-col :span="1.5">
             <el-form-item label="单据编码">
               <el-input
-                v-model="queryParams.code"
+                v-model.trim="queryParams.code"
                 size="small"
+                clearable
                 style="width: 200px"
               />
             </el-form-item>
           </el-col>
           <el-col :span="1.5">
-            <el-form-item label="供应仓库">
-              <el-select size="small" v-model="queryParams.warehouse" @focus="chooseOrg('WAREHOUSE_PARAM', true, '供应仓库')" style="width: 200px">
-                <el-option v-for="item in houseOptions" :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.customer" @focus="chooseOrg('CUSTOMER_PARAM', true, '选择客户')" style="width: 200px">
+              <el-select clearable size="small" v-model="queryParams.customer" @focus="chooseOrg('CUSTOMER_PARAM', true, '选择客户')" style="width: 200px">
                 <el-option v-for="item in customerOptions" :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 v-model="queryParams.isProcess" size="small" style="width: 200px" clearable placeholder="请选择">
+              <el-select clearable v-model="queryParams.isProcess" size="small" style="width: 200px" clearable placeholder="请选择">
                 <el-option
                   v-for="item in options"
                   :key="item.value"
@@ -50,21 +44,14 @@
         <el-row :gutter="10">
           <el-col :span="1.5">
             <el-form-item label="需求人员">
-              <el-select size="small" v-model="queryParams.demandPersonal" @focus="chooseOrg('CONTACTS_PARAM', true, '需求人员')" style="width: 200px">
+              <el-select clearable size="small" v-model="queryParams.demandPersonal" @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-select>
             </el-form-item>
           </el-col>
           <el-col :span="1.5">
-            <el-form-item label="供应货位">
-              <el-select size="small" v-model="queryParams.goodsAllocation" @focus="chooseOrg('ALLOCATION_PARAM', true, '供应货位')" style="width: 200px">
-                <el-option v-for="item in goodsOptions" :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 v-model="queryParams.source" size="small" style="width: 200px">
+              <el-select clearable v-model="queryParams.source" size="small" style="width: 200px">
                 <el-option v-for="dict in dict.type.sys_bill_source" :key="dict.value" :label="dict.label" :value="dict.value">
                 </el-option>
               </el-select>
@@ -75,7 +62,7 @@
         <el-row :gutter="10">
           <el-col :span="1.5">
             <el-form-item label="业务类型">
-              <el-select v-model="queryParams.billType" size="small" style="width: 200px">
+              <el-select clearable v-model="queryParams.billType" size="small" style="width: 200px">
                 <el-option v-for=" dict in dict.type.sys_business" :key="dict.value" :label="dict.label" :value="dict.value">
                 </el-option>
               </el-select>
@@ -83,7 +70,7 @@
           </el-col>
           <el-col :span="1.5">
             <el-form-item label="需求部门">
-              <el-select v-model="queryParams.demandDept" size="small" :disabled="disable" @focus="chooseOrg('DEPT_PARAM', true, '需求部门')" style="width: 200px">
+              <el-select clearable v-model="queryParams.demandDept" size="small" :disabled="disable" @focus="chooseOrg('DEPT_PARAM', true, '需求部门')" style="width: 200px">
                 <el-option
                   v-for="item in deptOptions"
                   :key="item.id"
@@ -98,6 +85,7 @@
               <el-date-picker
                 v-model="queryParams.demandDate"
                 type="date"
+                clearable
                 value-format="yyyy-MM-dd"
                 size="small"
                 style="width: 200px"
@@ -108,7 +96,7 @@
           <el-col :span="1.5">
             <el-form-item label="备注">
             <el-input
-              v-model="queryParams.remark"
+              v-model.trim="queryParams.remark"
               size="small"
               clearable
               style="width: 200px"
@@ -196,7 +184,7 @@
     </div>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px">
+    <el-dialog title="数据导入" :visible.sync="upload.open" width="400px">
       <el-upload
       ref="upload"
       :limit="1"
@@ -214,9 +202,9 @@
         将文件拖到此处，或
         <em>点击上传</em>
       </div>
-      <div class="el-upload__tip" slot="tip">
+      <!-- <div class="el-upload__tip" slot="tip">
         <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-      </div>
+      </div> -->
       <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -253,7 +241,7 @@ export default {
         // 是否显示弹出层（导入）
         open: false,
         // 弹出层标题（导入）
-        title: "",
+        title: "数据导入",
         // 是否禁用上传
         isUploading: false,
         // 是否更新已经存在的用户数据
@@ -271,11 +259,9 @@ export default {
       page: '',
       queryParams: {
         code: '',
-        warehouse: '',
         customer: '',
         isProcess: '',
         demandPersonal: '',
-        goodsAllocation: '',
         source: '',
         billType: '',
         demandDept: '',
@@ -290,14 +276,12 @@ export default {
         title: ''
       },
       options: [{
-        value: '0', label: '是',
+        value: 'Y', label: '是',
       }, {
-        value: '2', label: '否'
+        value: 'N', label: '否'
       }],
-      houseOptions: [],
       customerOptions: [],
       personOptions: [],
-      goodsOptions: [],
       deptOptions: [],
       tableList: [],
       total: 0,
@@ -359,11 +343,9 @@ export default {
     resetList() {
       this.queryParams = {
         code: '',
-        warehouse: '',
         customer: '',
         isProcess: '',
         demandPersonal: '',
-        goodsAllocation: '',
         source: '',
         billType: '',
         demandDept: '',
@@ -538,10 +520,6 @@ export default {
       this.$refs.refer.init(this.referCondition)
     },
     selectionsToInput(selection) {
-      if (this.referCondition.type == 'WAREHOUSE_PARAM') {
-        this.houseOptions = selection
-        this.queryParams.warehouse = selection[0].id
-      }
       if (this.referCondition.type == 'CUSTOMER_PARAM') {
         this.customerOptions = selection
         this.queryParams.customer = selection[0].id
@@ -550,10 +528,6 @@ export default {
         this.personOptions = selection
         this.queryParams.demandPersonal = selection[0].id
       }
-      if (this.referCondition.type == 'ALLOCATION_PARAM') {
-        this.goodsOptions = selection
-        this.queryParams.goodsAllocation = selection[0].id
-      }
       if (this.referCondition.type == 'DEPT_PARAM') {
         this.deptOptions = selection
         this.queryParams.demandDept = selection[0].id

src/views/purchase/deliveryAddress/add.vue

@@ -191,14 +191,14 @@ export default {
         title: ''
       },
       options: [{
-        value: '0', label: '启用',
+        value: 'Y', label: '启用',
       }, {
-        value: '2', label: '停用'
+        value: 'N', label: '停用'
       }],
       options2: [{
-        value: '0', label: '已同步',
+        value: 'Y', label: '已同步',
       }, {
-        value: '2', label: '未同步'
+        value: 'N', label: '未同步'
       }],
       houseOptions: [],
       contactsOptions: [],

src/views/purchase/deliveryAddress/index.vue

@@ -266,14 +266,14 @@ export default {
         pageSize: 5
       },
       options: [{
-        value: '0', label: '启用',
+        value: 'Y', label: '是',
       }, {
-        value: '2', label: '停用'
+        value: 'N', label: '否'
       }],
       options2: [{
-        value: '0', label: '已同步',
+        value: 'Y', label: '已同步',
       }, {
-        value: '2', label: '未同步'
+        value: 'N', label: '未同步'
       }],
       referCondition: {
         type: '',

src/views/purchase/transferOrder/add.vue

@@ -619,9 +619,9 @@ export default {
         warehouseCode: ''
       },
       options: [{
-        value: '0', label: '是',
+        value: 'Y', label: '是',
       }, {
-        value: '2', label: '否'
+        value: 'N', label: '否'
       }],
       tableIndex: null,
       chuOrgOptions: [],