前端sdy

src/views/contractManagement/purchaseContract.vue

@@ -4,10 +4,10 @@
   <div>
     <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
-        <ws-button type="primary" @click="handleAdd()"
-        v-hasPermission="
-            `contractManagement.buyContract.buyContractInfo.add`
-          "
+        <ws-button
+          type="primary"
+          @click="handleAdd()"
+          v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`"
           ><img
             width="13"
             height="13"
@@ -24,13 +24,15 @@
         <ws-button
           @click="exportlist()"
           v-hasPermission="
-           `contractManagement.buyContract.buyContractInfo.view`
+            `contractManagement.buyContract.buyContractInfo.view`
           "
           >导出</ws-button
         >
       </template>
       <template slot="right">
-          <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
+        <span style="width: 142px; display: inline-block; color: #8890b1"
+          >状态：</span
+        >
         <ws-select
           v-model="searchTypeText"
           placeholder=""
@@ -43,7 +45,7 @@
             :key="item.value"
             :label="item.value"
             :value="item.value"
-            style="color: #8890B1;"
+            style="color: #8890b1"
           />
         </ws-select>
 
@@ -67,10 +69,7 @@
           class="findValue"
         ></ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <ws-button
-          class="find"
-          type="primary"
-          @click="find()"
+        <ws-button class="find" type="primary" @click="find()"
           ><img
             width="16"
             height="16"
@@ -155,7 +154,11 @@
             </template>
             <div>
               <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-              <div v-for="(item, index) in historyList" :key='index' class="flex">
+              <div
+                v-for="(item, index) in historyList"
+                :key="index"
+                class="flex"
+              >
                 <div class="vertical-text vertical-text-left">
                   {{ item.updateDate }}
                 </div>
@@ -211,8 +214,8 @@
             src="../../../public/img/chakan.png"
             @click="handleExamine(scope.row)"
             v-hasPermission="
-           `contractManagement.buyContract.buyContractInfo.view`
-          "
+              `contractManagement.buyContract.buyContractInfo.view`
+            "
             alt=""
           />
           <img
@@ -222,8 +225,8 @@
             src="../../../public/img/bianji.png"
             @click="handleEdit(scope.row)"
             v-hasPermission="
-           `contractManagement.buyContract.buyContractInfo.edit`
-          "
+              `contractManagement.buyContract.buyContractInfo.edit`
+            "
             alt=""
           />
           <img
@@ -237,8 +240,8 @@
             "
             src="../../../public/img/shanchu.png"
             v-hasPermission="
-           `contractManagement.buyContract.buyContractInfo.delete`
-          "
+              `contractManagement.buyContract.buyContractInfo.delete`
+            "
             @click="handleDelete(scope.row)"
             alt=""
           />
@@ -273,7 +276,7 @@
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
     </WinseaContentModal> -->
-     <WinseaContentModal
+    <!-- <WinseaContentModal
       v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose"
@@ -287,16 +290,38 @@
         <img width="100" height="100" :src="items1" alt="" style=""/>
         </div>
       </div>
-    </WinseaContentModal>
+    </WinseaContentModal> -->
+
     <WinseaContentModal
-      v-model="accesscard"
+      v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose1"
+      @on-cancel="handleClose"
     >
+      <el-upload
+        class="upload-demo"
+        action="https://www.zthymaoyi.com/upload/admin"
+        :on-success="
+          (res, file) => {
+            uploadSuccessHandle(res)
+          }
+        "
+        multiple
+        :limit="3"
+        :file-list="fileList"
+      >
+        <el-button size="small" type="primary">附件附件</el-button>
+        <div slot="tip" class="el-upload__tip">
+          推荐格式.jpg, .jpeg, .png, .gif, .pdf, .doc, .zip,
+          .rar，单个文件大小不超过10M
+        </div>
+      </el-upload>
       <p>查看附件</p>
-      <img width="100" height="100" :src="accessurl" alt="" />
+      <div style="display: flex;">
+      <div style="display: flex; margin: 5px" v-for="item in this.appendixIdss">
+          <img width="100" height="100" :src="item" alt=""/>
+      </div>
+      </div>
     </WinseaContentModal>
-    
   </div>
 </template>
 <script>
@@ -310,7 +335,7 @@ import {
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs,  EventBus } from 'base-core-lib'
+import { dayjs, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -350,9 +375,9 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
-      addressUrls:[],
-      accessurl:'',
-      accesscard:false,
+      addressUrls: [],
+      accessurl: '',
+      accesscard: false,
       // 提交类型
       submitType: true,
       deptCircularPage: {},
@@ -363,6 +388,8 @@ export default {
       contractList: [],
       deptBudgetList: {},
       historyList: [],
+      appendixIdss: [],
+      fileList:[],
       compId: sessionStorage.getItem('ws-pf_compId'),
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -496,13 +523,12 @@ export default {
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
           this.contractList = response
-           for (var i = 0; i < response.records.length; i++) {
-
+          for (var i = 0; i < response.records.length; i++) {
             var arr = new Array()
-           this.addressUrls[i] = new Array()
+            this.addressUrls[i] = new Array()
             if (this.contractList.records[i].addressUrl != null) {
-            arr = this.contractList.records[i].addressUrl.split(',')
-             this.addressUrls[i]=arr
+              arr = this.contractList.records[i].addressUrl.split(',')
+              this.addressUrls[i] = arr
             }
           }
         })
@@ -556,10 +582,7 @@ export default {
       }
     },
     fujian(row) {
-      if (
-        row.addressUrl === null ||
-        row.addressUrl === ''
-      ) {
+      if (row.addressUrl === null || row.addressUrl === '') {
         EventBus.$emit(
           'warning',
           this.$t('system.noticeCircular.NoInformation')
@@ -567,7 +590,7 @@ export default {
       } else {
         this.accessoryTFs = true
       }
-      this.appendixIdss = row.addressUrlArray
+      this.appendixIdss = row.addressUrl.split(',')
     },
     handleExamine(row) {
       console.log(row)
@@ -958,7 +981,7 @@ export default {
     padding: 0 !important;
   }
 }
-/deep/.typeselect .el-input__inner{
-   color: #8890B1;
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
 }
 </style>

src/views/contractManagement/purchaseContractAdd.vue

@@ -532,7 +532,8 @@
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       /> -->
-      <el-upload
+      <!-- -------------- -->
+      <!-- <el-upload
           action="https://www.zthymaoyi.com/upload/admin"
           :show-file-list="false"
           :on-success="
@@ -562,7 +563,25 @@
               />
             </div>
           </div>
+        </div> -->
+
+      <el-upload
+        class="upload-demo"
+        action="https://www.zthymaoyi.com/upload/admin"
+         :on-success="
+            (res, file) => {
+              uploadSuccessHandle(res)
+            }
+          "
+        multiple
+        :limit="3"
+        :file-list="fileList"
+      >
+        <el-button size="small" type="primary">点击上传</el-button>
+        <div slot="tip" class="el-upload__tip">
+          推荐格式.jpg, .jpeg, .png, .gif, .pdf, .doc, .zip, .rar，单个文件大小不超过10M
         </div>
+      </el-upload>
     </ws-form>
     <div style="text-align: right; padding: 10px" class="center">
       <el-button
@@ -657,15 +676,6 @@ export default {
           return time.getTime() > Date.now()
         },
       },
-      // selectpackingMethod: {},
-      // selectgrade: {},
-      // selectunitList: {},
-      // selectDuty: {},
-      // isEdited: false,
-      // registered: {},
-      // selectCrtDuty: {},
-      // dutyList: {},
-      // sexList: {},
       ruleDeptBudget: {
         contractNo: [
           { required: true, message: '请输入活动名称', trigger: 'blur' },
@@ -679,7 +689,8 @@ export default {
       },
       selectIntendedShip: {},
       interviewTypeList: {},
-      addressUrls:[],
+      addressUrls: [],
+      fileList:[],
     }
   },
   activated() {
@@ -1250,23 +1261,33 @@ export default {
       var that = this
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
-          this.deptBudgetList.sourceProvince = CodeToText[this.selectedOptions[0]]
-          this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]     
-          this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions1[0]]
-          this.deptBudgetList.deliveryCity = CodeToText[this.selectedOptions1[1]]
+          this.deptBudgetList.sourceProvince =
+            CodeToText[this.selectedOptions[0]]
+          this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]
+          this.deptBudgetList.deliveryProvince =
+            CodeToText[this.selectedOptions1[0]]
+          this.deptBudgetList.deliveryCity =
+            CodeToText[this.selectedOptions1[1]]
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 2
-            if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
-            this.deptBudgetList.deliveryArea = "特别行政区"
-          }else{ 
-             this.deptBudgetList.deliveryArea = CodeToText[this.selectedOptions1[2]]
+          if (
+            this.deptBudgetList.deliveryProvince == '澳门特别行政区' ||
+            this.deptBudgetList.deliveryProvince == '澳门特别行政区'
+          ) {
+            this.deptBudgetList.deliveryArea = '特别行政区'
+          } else {
+            this.deptBudgetList.deliveryArea =
+              CodeToText[this.selectedOptions1[2]]
           }
-             if(this.deptBudgetList.sourceProvince =="澳门特别行政区" || this.deptBudgetList.sourceProvince == "澳门特别行政区"){
-            this.deptBudgetList.sourceArea = "特别行政区"
-          }else{
-             this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
+          if (
+            this.deptBudgetList.sourceProvince == '澳门特别行政区' ||
+            this.deptBudgetList.sourceProvince == '澳门特别行政区'
+          ) {
+            this.deptBudgetList.sourceArea = '特别行政区'
+          } else {
+            this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
           }
-            this.deptBudgetList.addressUrl = this.addressUrls.toString()
+          this.deptBudgetList.addressUrl = this.addressUrls.toString()
 
           addList(this.deptBudgetList)
             .toPromise()
@@ -1618,7 +1639,7 @@ export default {
 /deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
   width: 130px;
 }
-.el-textarea{
+.el-textarea {
   width: 101%;
 }
 .addressUrls {
@@ -1638,4 +1659,12 @@ export default {
   margin: 0px 10px;
   border-radius: 3px;
 }
+//上传文件成功标识
+/deep/.el-upload-list__item-status-label {
+    position: absolute;
+    right: 22px;
+    top: -1px;
+    line-height: inherit;
+    display: none;
+}
 </style>

src/views/contractManagement/purchaseContractEdit.vue

@@ -478,48 +478,23 @@
           placeholder="请输入备注信息，不超过200字"
           maxlength="200"
         />
-        <!-- <ws-upload
-          ref="upload"
-          table-name="maintain_work_order"
-          oss-key="mainPlan"
-          :comp-id="compId"
-          :appendix-ids="appendixIdsAdd"
-          :vesselId="deptBudgetList.addressUrl"
-          :size-limit="size"
-          @uploadSuccess="uploadSuccess"
-          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-        /> -->
         <el-upload
-          action="https://www.zthymaoyi.com/upload/admin"
-          :show-file-list="false"
-          :on-success="
+        class="upload-demo"
+        action="https://www.zthymaoyi.com/upload/admin"
+         :on-success="
             (res, file) => {
               uploadSuccessHandle(res)
             }
           "
-          class="avatar-uploader"
-          accept=".jpg, .jpeg, .png, .gif, .doc, .zip, .rar"
-        >
-          <el-button style="margin-top: 10px">上传附件</el-button>
-        </el-upload>
-        <div class="addressUrls" v-if="addressUrls != null">
-          <div class="addressUrls-item">
-            <div
-              v-for="(item, index) in addressUrls"
-              class="addressUrl"
-              :key="index"
-            >
-              <div @click="close(index)" class="iconfont icon-guanbi"></div>
-              <img
-                v-if="addressUrls != null"
-                width="100"
-                height="100"
-                :src="item"
-                alt=""
-              />
-            </div>
-          </div>
+        multiple
+        :limit="3"
+        :file-list="fileList"
+      >
+        <el-button size="small" type="primary">上传附件</el-button>
+        <div slot="tip" class="el-upload__tip">
+          推荐格式.jpg, .jpeg, .png, .gif, .pdf, .doc, .zip, .rar，单个文件大小不超过10M
         </div>
+      </el-upload>
       </base-card>
     </ws-form>
     <div style="text-align: right; padding: 10px">
@@ -601,6 +576,7 @@ export default {
       compId: sessionStorage.getItem('ws-pf_compId'),
       addressUrls:[],
       addressUrl:'',
+      fileList:[],
     }
   },
 
@@ -702,7 +678,9 @@ export default {
           }
           if(this.deptBudgetList.addressUrl != null){
             this.addressUrls = this.deptBudgetList.addressUrl.split(",")
+            this.fileList = this.deptBudgetList.addressUrl.split(",")
           }
+          
         })
       // 包装方式
       packList({ constId: 'CON1' })
@@ -1591,4 +1569,12 @@ export default {
   margin: 0px 10px;
   border-radius: 3px;
 }
+//上传文件成功标识
+/deep/.el-upload-list__item-status-label {
+    position: absolute;
+    right: 22px;
+    top: -1px;
+    line-height: inherit;
+    display: none;
+}
 </style>

src/views/contractManagement/salesContract.vue

@@ -261,48 +261,35 @@
       :total="deptBudgetTotal"
     >
     </el-pagination>
-    <!-- 附件弹框 -->
-    <!-- <WinseaContentModal
+     <WinseaContentModal
       v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose"
     >
-      <p>查看附件</p>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="deptBudgetList.addressUrl"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
-    </WinseaContentModal> -->
-    <!-- 附件弹框 -->
-    <WinseaContentModal
-      v-model="accessoryTFs"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose"
-    >
-      <p>查看附件</p>
-      <div
-        style="display: flex; margin: 5px"
-        v-for="item in this.addressUrls"
+      <el-upload
+        class="upload-demo"
+        action="https://www.zthymaoyi.com/upload/admin"
+        :on-success="
+          (res, file) => {
+            uploadSuccessHandle(res)
+          }
+        "
+        multiple
+        :limit="3"
+        :file-list="fileList"
       >
-      <div  v-for="items1 in item">
-        <img width="100" height="100" :src="items1" alt="" style=""/>
+        <el-button size="small" type="primary">上传附件</el-button>
+        <div slot="tip" class="el-upload__tip">
+          推荐格式.jpg, .jpeg, .png, .gif, .pdf, .doc, .zip,
+          .rar，单个文件大小不超过10M
         </div>
-      </div>
-    </WinseaContentModal>
-    <WinseaContentModal
-      v-model="accesscard"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose1"
-    >
+      </el-upload>
       <p>查看附件</p>
-      <img width="100" height="100" :src="accessurl" alt="" />
+      <div style="display: flex;">
+      <div style="display: flex; margin: 5px" v-for="item in this.appendixIdss">
+          <img width="100" height="100" :src="item" alt=""/>
+      </div>
+      </div>
     </WinseaContentModal>
   </div>
 </template>
@@ -362,6 +349,7 @@ export default {
       categoryIndex: 0,
       rulesVendor: {},
       size: 10,
+      appendixIdss:[],
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       date: {
@@ -379,6 +367,7 @@ export default {
       accessoryTFs: false,
       accesscard: false,
       accessurl: '',
+      fileList:[],
       taskTypeList: [
         { value: '未完成', type: 1 },
         { value: '已完成', type: 2 },
@@ -586,7 +575,7 @@ export default {
       } else {
         this.accessoryTFs = true
       }
-      this.appendixIdss = row.addressUrl
+      this.appendixIdss = row.addressUrl.split(',')
     },
     handleExamine(row) {
       this.$router.push({

src/views/contractManagement/salesContractAdd.vue

@@ -555,7 +555,7 @@
           placeholder="请输入备注信息，不超过200字"
           maxlength="200"
         />
-        <el-upload
+        <!-- <el-upload
           action="https://www.zthymaoyi.com/upload/admin"
           :show-file-list="false"
           :on-success="
@@ -585,7 +585,24 @@
               />
             </div>
           </div>
+        </div> -->
+        <el-upload
+        class="upload-demo"
+        action="https://www.zthymaoyi.com/upload/admin"
+         :on-success="
+            (res, file) => {
+              uploadSuccessHandle(res)
+            }
+          "
+        multiple
+        :limit="3"
+        :file-list="fileList"
+      >
+        <el-button size="small" type="primary">上传附件</el-button>
+        <div slot="tip" class="el-upload__tip">
+          推荐格式.jpg, .jpeg, .png, .gif, .pdf, .doc, .zip, .rar，单个文件大小不超过10M
         </div>
+      </el-upload>
       </ws-form>
     </div>
     <div style="text-align: right; padding: 10px" class="center">
@@ -686,6 +703,7 @@ export default {
       },
       selectIntendedShip: {},
       interviewTypeList: {},
+      fileList:[],
     }
   },
   activated() {
@@ -1695,4 +1713,12 @@ export default {
   margin: 0px 10px;
   border-radius: 3px;
 }
+//上传文件成功标识
+/deep/.el-upload-list__item-status-label {
+    position: absolute;
+    right: 22px;
+    top: -1px;
+    line-height: inherit;
+    display: none;
+}
 </style>

src/views/contractManagement/salesContractEdit.vue

@@ -519,49 +519,23 @@
           placeholder="请输入备注信息，不超过200字"
           maxlength="200"
         />
-        <!-- <ws-upload
-          ref="upload"
-          table-name="maintain_work_order"
-          oss-key="mainPlan"
-          :comp-id="compId"
-          :appendix-ids="appendixIdsAdd"
-          :vesselId="deptBudgetList.addressUrl"
-          :size-limit="size"
-          @uploadSuccess="uploadSuccess"
-          @onChange="onChange"
-          accept=".jpg, .jpeg, .png,.gif, .pdf, .doc, .zip, .rar"
-        /> -->
-         <el-upload
-          action="https://www.zthymaoyi.com/upload/admin"
-          :show-file-list="false"
-          :on-success="
+        <el-upload
+        class="upload-demo"
+        action="https://www.zthymaoyi.com/upload/admin"
+         :on-success="
             (res, file) => {
               uploadSuccessHandle(res)
             }
           "
-          class="avatar-uploader"
-          accept=".jpg, .jpeg, .png, .gif, .doc, .zip, .rar"
-        >
-          <el-button style="margin-top: 10px">上传附件</el-button>
-        </el-upload>
-        <div class="addressUrls" v-if="addressUrls != null">
-          <div class="addressUrls-item">
-            <div
-              v-for="(item, index) in addressUrls"
-              class="addressUrl"
-              :key="index"
-            >
-              <div @click="close(index)" class="iconfont icon-guanbi"></div>
-              <img
-                v-if="addressUrls != null"
-                width="100"
-                height="100"
-                :src="item"
-                alt=""
-              />
-            </div>
-          </div>
+        multiple
+        :limit="3"
+        :file-list="fileList"
+      >
+        <el-button size="small" type="primary">上传附件</el-button>
+        <div slot="tip" class="el-upload__tip">
+          推荐格式.jpg, .jpeg, .png, .gif, .pdf, .doc, .zip, .rar，单个文件大小不超过10M
         </div>
+      </el-upload>
       </ws-form>
     </div>
     <div style="text-align: right; padding: 10px" class="center">
@@ -655,6 +629,7 @@ export default {
       interviewTypeList: {},
       addressUrl:'',
       addressUrls:[],
+      fileList:[]
     }
   },
   activated() {
@@ -1640,4 +1615,12 @@ export default {
   margin: 0px 10px;
   border-radius: 3px;
 }
+//上传文件成功标识
+/deep/.el-upload-list__item-status-label {
+    position: absolute;
+    right: 22px;
+    top: -1px;
+    line-height: inherit;
+    display: none;
+}
 </style>

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -70,16 +70,13 @@
             <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item label="合同编号">
-            <!-- <el-option
-              v-for="item in contractNoList"
-              :key="item.constKey"
-              :label="item.contractNo"
-              :value="item.contractNo"
-            ></el-option> -->
-            <div v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">  {{dataList.moveTaskNo}}</div>
-            <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
-            <!-- </el-select> -->
+            <!-- 合同编号 -->
+          <el-form-item label="合同编号" v-if="dataList.taskTypeKey != 3">
+            {{dataList.contractNo}}
+           
+          </el-form-item>
+           <el-form-item label="移库任务编号" v-if="dataList.taskTypeKey == 3">
+            {{dataList.moveTaskNo}}
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -180,15 +177,12 @@
             <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item label="合同编号">
-            <!-- <el-option
-              v-for="item in contractNoList"
-              :key="item.constKey"
-              :label="item.contractNo"
-              :value="item.contractNo"
-            ></el-option> -->
-               <div v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">  {{dataList.moveTaskNo}}</div>
-            <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
+          <el-form-item label="合同编号" v-if="dataList1.taskTypeKey != 3">
+            {{dataList.contractNo}}
+           
+          </el-form-item>
+           <el-form-item label="移库任务编号" v-if="dataList1.taskTypeKey == 3">
+            {{dataList.moveTaskNo}}
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -140,6 +140,7 @@
           style="width: 36%"
         >
           <el-select
+            @change="sendWarehousechange1"
             v-model="deptBudgetList.receiveWarehouse"
             :disabled="warehouse"
             placeholder="请输入收货库点"
@@ -414,6 +415,7 @@ export default {
       compId: sessionStorage.getItem('ws-pf_compId'),
       mainReportAdd: {},
       warehouseList: [],
+      warehouseList1:[],
       goodnameList: [],
       taskType: [],
       size: 10,
@@ -428,7 +430,6 @@ export default {
   },
   activated() {
     this.loaddata()
-
     this.showType = this.isShow
   },
   computed: {
@@ -473,6 +474,29 @@ export default {
         }
       }
     },
+    sendWarehousechange1(e){
+       for (let i = 0; i < this.warehouseList1.length; i++) {
+        if (this.warehouseList1[i].warehouseName == e) {
+          var tmp = []
+          tmp[0] = TextToCode[this.warehouseList1[i].warehousePrivate].code
+          tmp[1] =
+            TextToCode[this.warehouseList1[i].warehousePrivate][
+              this.warehouseList1[i].warehouseCity
+            ].code
+          tmp[2] =
+            TextToCode[this.warehouseList1[i].warehousePrivate][
+              this.warehouseList1[i].warehouseCity
+            ][this.warehouseList1[i].warehouseArea].code
+          this.selectedOptions1 = tmp
+          this.$set(
+            this.deptBudgetList,
+            'endDetailedAddress',
+            this.warehouseList1[i].detailedAddress
+          )
+        }
+      }
+
+    },
 
     warehouseTypechange() {
       getwarehousename({
@@ -612,6 +636,14 @@ export default {
         .then((response) => {
           this.warehouseList = response
         })
+         getwarehousename({
+        compId: this.compId,
+        warehouseType: 1,
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList1 = response
+        })
       xialaNo({
         compId: this.compId,
       })

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -81,7 +81,7 @@
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
         <el-table-column prop="contractNo" label="合同编号" width="80">
-          <template scope="scope">
+          <!-- <template scope="scope">
             <div
               v-if="
                 scope.row.inOutType == '移库入库' ||
@@ -98,7 +98,7 @@
             >
               {{ scope.row.contractNo }}
             </div>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column
           prop="warehouseName"

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -28,7 +28,9 @@
         <div class="nav">
           <span class="ziti">
             任务类型：
-            <h1 class="ziti1">{{ dataList.inOutType }}</h1>
+            <h1 class="ziti1" v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"> 移库任务</h1>
+          <h1 class="ziti1" v-show="dataList.inOutType == '销售出库'||dataList.inOutType == '暂存出库'||dataList.inOutType == '贸易服务出库'||dataList.inOutType == '采购出库'"> 出库任务</h1>
+          <h1 class="ziti1" v-show="dataList.inOutType == '采购入库'||dataList.inOutType == '暂存入库'||dataList.inOutType == '贸易服务入库'||dataList.inOutType == '退库'"> 入库任务</h1>
           </span>
         </div>
       </div>
@@ -291,7 +293,7 @@
           label-width="140px"
         >
           <!-- 仓库名 -->
-          <el-form-item label="仓库名" v-if="dataList1.inOutType == '移库出库'">
+          <el-form-item label="仓库名" v-if="dataList1.inOutType == '移库入库'">
             <el-select
               disabled
               v-model="dataList1.warehouseName"
@@ -309,7 +311,7 @@
           <!-- 出库类型 -->
           <el-form-item
             label="入库类型"
-            v-if="dataList1.inOutType == '移库出库'"
+            v-if="dataList1.inOutType == '移库入库'"
           >
             <el-select
               disabled