1

src/views/personnelManagement/cardReplacementManagement.vue

@@ -90,7 +90,7 @@
         form:{},
         dialogVisible2:false,
         deptCircularPage: {},
-        searchType:'1',
+        searchType:'2',
         searchKeyWord:'',
         strokeType:'1',
         title:'附件',

src/views/personnelManagement/leaveList.vue

@@ -103,7 +103,7 @@
         outerVisibleAdd: false,
         outerVisibleReturn: false,
         contractType: 2,
-        searchType: '',
+        searchType: '1',
         // 提交类型
         submitType: true,
         size: 10,

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -120,8 +120,8 @@
 					<!-- <el-form-item label="预估运费（元/吨）" span="1">
               {{dataList.estimatedFreight}}
 					</el-form-item> -->
-          <!--发货人-->
-          <el-form-item label="发货人">
+          <!--发货负责人-->
+          <el-form-item label="发货负责人">
             {{dataList.agent}}
             <el-option
               v-for="item in options"
@@ -236,8 +236,8 @@
 					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
               {{dataList1.estimatedFreight}}
           </el-form-item> -->
-          <!--收货人-->
-          <el-form-item label="收货人">
+          <!--收货负责人-->
+          <el-form-item label="收货负责人">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -345,8 +345,8 @@
 					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
           {{dataList.estimatedFreight}}
 					</el-form-item> -->
-          <!--发货人-->
-          <el-form-item label="发货人">
+          <!--发货负责人-->
+          <el-form-item label="发货负责人">
             {{dataList.agent}}
             <el-option
               v-for="item in options"
@@ -689,7 +689,7 @@ export default {
             }
           }
           if(this.dataList.sourceRelationInfoList){
-            if(this.dataList.taskTypeKey==2&&this.dataList.inOutType=="退库"||this.dataList.taskTypeKey==4){
+            if(this.dataList.taskTypeKey==2&&this.dataList.inOutType=='退库'||this.dataList.taskTypeKey==4){
                   this.goods=this.dataList1.sourceId
                 }else 
               for (let i = 0; i < this.dataList.sourceRelationInfoList.length; i++) {
@@ -705,7 +705,7 @@ export default {
 					.then(response1 => {
              for (let i = 0; i < response1.length; i++) {
                 if (response1[i].contractNo == this.dataList.contractNo) {
-                    if(response1[i].priceType == "随行就市"){
+                    if(response1[i].priceType == '随行就市'){
                       this.Pricetype = false
                     }else{
                       this.Pricetype = true

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -248,8 +248,8 @@
 							maxlength="20" size="small" type="number" />
 					</el-form-item> -->
 					<!-- 经办人-->
-					<el-form-item label="收货人">
-            <el-select v-model="dataList1.agent" placeholder="请选择收货人" filterable clearable :filter-method="dataFilter1"
+					<el-form-item label="收货负责人">
+            <el-select v-model="dataList1.agent" placeholder="请选择收货负责人" filterable clearable :filter-method="dataFilter1"
               @change="selectstaff1">
               <el-option v-for="item in options1" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
@@ -354,8 +354,8 @@
 							maxlength="20" size="small" type="number" />
 					</el-form-item> -->
 					<!--发货人-->
-					<el-form-item label="发货人">
-            <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable clearable
+					<el-form-item label="发货负责人">
+            <el-select v-model="dataList.agent" placeholder="请选择发货负责人" filterable clearable
               @change="selectstaff">
               <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -261,11 +261,11 @@
 						<el-input  v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small"  />
 					</el-form-item> -->
-          <!--发货人-->
-          <el-form-item label="发货人">
+          <!--发货负责人-->
+          <el-form-item label="发货负责人">
             <el-select
               v-model="dataList.agent"
-              placeholder="请选择发货人"
+              placeholder="请选择发货负责人"
               filterable
               disabled
               @change="selectstaff"
@@ -519,10 +519,10 @@
 							maxlength="20" size="small"  />
 					</el-form-item> -->
           <!-- 经办人-->
-          <el-form-item label="收货人">
+          <el-form-item label="收货负责人">
             <el-select
               v-model="dataList1.agent"
-              placeholder="请选择收货人"
+              placeholder="请选择收货负责人"
               filterable
               disabled
               @change="selectstaff1"
@@ -729,11 +729,11 @@
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small"  />
 					</el-form-item> -->
-          <!--发货人-->
-          <el-form-item label="出库发货人">
+          <!--发货负责人-->
+          <el-form-item label="出库发货负责人">
             <el-select
               v-model="dataList.agent"
-              placeholder="请选择发货人"
+              placeholder="请选择发货负责人"
               filterable
               disabled
               @change="selectstaff"
@@ -884,16 +884,16 @@ export default {
     this.dataList.weight = 0
     this.dataList1.weight = 0
     this.getList()
-    if(localStorage.getItem("taskTypeKey")){
-				this.dataList.taskTypeKey=localStorage.getItem("taskTypeKey")
-        this.dataList1.taskTypeKey=localStorage.getItem("taskTypeKey")
+    if(localStorage.getItem('taskTypeKey')){
+				this.dataList.taskTypeKey=localStorage.getItem('taskTypeKey')
+        this.dataList1.taskTypeKey=localStorage.getItem('taskTypeKey')
 				if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
-					this.dataList.warehouseName=localStorage.getItem("warehouse")
-					this.dataList.contractNo=localStorage.getItem("contractNo")
+					this.dataList.warehouseName=localStorage.getItem('warehouse')
+					this.dataList.contractNo=localStorage.getItem('contractNo')
 				}
 				else if(this.dataList.taskTypeKey==2||this.dataList.taskTypeKey==4){
-					this.dataList1.warehouseName=localStorage.getItem("warehouse")
-					this.dataList1.contractNo=localStorage.getItem("contractNo")
+					this.dataList1.warehouseName=localStorage.getItem('warehouse')
+					this.dataList1.contractNo=localStorage.getItem('contractNo')
 				}
 		}
     var num = 0
@@ -912,9 +912,9 @@ export default {
     supplygoods() {
       if (this.dataList.taskTypeKey == 1 || this.dataList.taskTypeKey == 3) {
         if (this.dataList.warehouseName) {
-          localStorage.setItem("warehouse",this.dataList.warehouseName);
-					localStorage.setItem("contractNo",this.dataList.contractNo);
-          localStorage.setItem("taskTypeKey",this.dataList.taskTypeKey);
+          localStorage.setItem('warehouse',this.dataList.warehouseName);
+					localStorage.setItem('contractNo',this.dataList.contractNo);
+          localStorage.setItem('taskTypeKey',this.dataList.taskTypeKey);
           this.$router.push({
             name: 'supplyofgoodsedit',
             query: {
@@ -932,9 +932,9 @@ export default {
         this.dataList1.taskTypeKey == 4
       ) {
         if (this.dataList1.moveTaskNo || this.dataList1.contractNo) {
-          localStorage.setItem("warehouse",this.dataList1.warehouseName);
-					localStorage.setItem("contractNo",this.dataList1.contractNo);
-          localStorage.setItem("taskTypeKey",this.dataList1.taskTypeKey);
+          localStorage.setItem('warehouse',this.dataList1.warehouseName);
+					localStorage.setItem('contractNo',this.dataList1.contractNo);
+          localStorage.setItem('taskTypeKey',this.dataList1.taskTypeKey);
           this.$router.push({
             name: 'outsupplyofgoodsedit',
             query: {
@@ -1123,9 +1123,9 @@ export default {
     },
     //提交按钮
     submit() {
-      localStorage.removeItem("warehouse")
-			localStorage.removeItem("contractNo");
-      localStorage.removeItem("taskTypeKey");
+      localStorage.removeItem('warehouse')
+			localStorage.removeItem('contractNo');
+      localStorage.removeItem('taskTypeKey');
       this.dataList.inOutFlag = 1
       this.dataList1.inOutFlag = 2
       var supplygoods = JSON.parse(localStorage.getItem('supplygoods'))