前端孟祥旭

public/static/iconfont/demo_index.html

@@ -54,6 +54,24 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe6c9;</span>
+                <div class="name">关  闭</div>
+                <div class="code-name">&amp;#xe6c9;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe63a;</span>
+                <div class="name">眼睛-睁眼</div>
+                <div class="code-name">&amp;#xe63a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe63b;</span>
+                <div class="name">眼睛-闭眼</div>
+                <div class="code-name">&amp;#xe63b;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe609;</span>
                 <div class="name">yunshuguanli</div>
@@ -114,9 +132,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1625617801377') format('woff2'),
-       url('iconfont.woff?t=1625617801377') format('woff'),
-       url('iconfont.ttf?t=1625617801377') format('truetype');
+  src: url('iconfont.woff2?t=1626864886667') format('woff2'),
+       url('iconfont.woff?t=1626864886667') format('woff'),
+       url('iconfont.ttf?t=1626864886667') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -142,6 +160,33 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-guanbi"></span>
+            <div class="name">
+              关  闭
+            </div>
+            <div class="code-name">.icon-guanbi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yanjing-zhengyan"></span>
+            <div class="name">
+              眼睛-睁眼
+            </div>
+            <div class="code-name">.icon-yanjing-zhengyan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yanjing-biyan"></span>
+            <div class="name">
+              眼睛-闭眼
+            </div>
+            <div class="code-name">.icon-yanjing-biyan
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-yunshu2"></span>
             <div class="name">
@@ -232,6 +277,30 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-guanbi"></use>
+                </svg>
+                <div class="name">关  闭</div>
+                <div class="code-name">#icon-guanbi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yanjing-zhengyan"></use>
+                </svg>
+                <div class="name">眼睛-睁眼</div>
+                <div class="code-name">#icon-yanjing-zhengyan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yanjing-biyan"></use>
+                </svg>
+                <div class="name">眼睛-闭眼</div>
+                <div class="code-name">#icon-yanjing-biyan</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-yunshu2"></use>

public/static/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2554236 */
-  src: url('iconfont.woff2?t=1625617801377') format('woff2'),
-       url('iconfont.woff?t=1625617801377') format('woff'),
-       url('iconfont.ttf?t=1625617801377') format('truetype');
+  src: url('iconfont.woff2?t=1626864886667') format('woff2'),
+       url('iconfont.woff?t=1626864886667') format('woff'),
+       url('iconfont.ttf?t=1626864886667') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-guanbi:before {
+  content: "\e6c9";
+}
+
+.icon-yanjing-zhengyan:before {
+  content: "\e63a";
+}
+
+.icon-yanjing-biyan:before {
+  content: "\e63b";
+}
+
 .icon-yunshu2:before {
   content: "\e609";
 }

public/static/iconfont/iconfont.json

@@ -5,6 +5,27 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "17984171",
+      "name": "关  闭",
+      "font_class": "guanbi",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
+    {
+      "icon_id": "10715457",
+      "name": "眼睛-睁眼",
+      "font_class": "yanjing-zhengyan",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "10715460",
+      "name": "眼睛-闭眼",
+      "font_class": "yanjing-biyan",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
     {
       "icon_id": "22711544",
       "name": "yunshuguanli",

src/api/V2/taskspost/index.js

@@ -41,4 +41,6 @@ export const API_POST_OUT_STATES = '/tranTaskInfo/api/editStatus'
 //移库任务状态修改
 export const API_POST_OUT_MOVESTATES = '/inOutWarehouseTask/api/editStatus'
 // 删除运输阶段
-export const API_POST_DEL_HAULAGE_STAGE= '/tranProcessInfo/api/deleteTranProcess'
+export const API_POST_DEL_HAULAGE_STAGE= '/tranProcessInfo/api/deleteTranProcess'
+// 审核记录
+export const API_GET_TASKHISTORIES= '/workflowHistory/query/taskHistories'

src/model/tasksport/index.js

@@ -22,7 +22,8 @@ import {
     API_GET_OUT_MOVELOOK,
     API_POST_OUT_STATES,
     API_POST_OUT_MOVESTATES,
-    API_POST_DEL_HAULAGE_STAGE
+    API_POST_DEL_HAULAGE_STAGE,
+    API_GET_TASKHISTORIES
 } from '@/api/V2/taskspost'
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
@@ -65,4 +66,6 @@ export const states = appRx.post(API_POST_OUT_STATES, errorCatcher, errorHandle,
 //移库任务状态修改
 export const movestates = appRx.post(API_POST_OUT_MOVESTATES, errorCatcher, errorHandle, filter)
 //删除运输阶段
-export const delhaulagestage = appRx.post(API_POST_DEL_HAULAGE_STAGE, errorCatcher, errorHandle, filter)
+export const delhaulagestage = appRx.post(API_POST_DEL_HAULAGE_STAGE, errorCatcher, errorHandle, filter)
+//删除运输阶段
+export const gettaskhistories = appRx.get(API_GET_TASKHISTORIES, errorCatcher, errorHandle, filter)

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=""
           />
@@ -255,7 +258,7 @@
     >
     </el-pagination>
     <!-- 附件弹框 -->
-    <WinseaContentModal
+    <!-- <WinseaContentModal
       v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose"
@@ -272,6 +275,52 @@
         @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"
+      >
+      <div  v-for="items1 in item">
+        <img width="100" height="100" :src="items1" alt="" style=""/>
+        </div>
+      </div>
+    </WinseaContentModal> -->
+
+    <WinseaContentModal
+      v-model="accessoryTFs"
+      :title="$t('system.noticeCircular.information')"
+      @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>
+      <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>
@@ -286,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: {
@@ -326,6 +375,9 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
+      addressUrls: [],
+      accessurl: '',
+      accesscard: false,
       // 提交类型
       submitType: true,
       deptCircularPage: {},
@@ -336,6 +388,8 @@ export default {
       contractList: [],
       deptBudgetList: {},
       historyList: [],
+      appendixIdss: [],
+      fileList:[],
       compId: sessionStorage.getItem('ws-pf_compId'),
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -397,7 +451,6 @@ export default {
     }
   },
   activated() {
-    console.log(this.$permission('PERMISSIONS.BUYCONTRACTINFO_ADD'))
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
@@ -429,7 +482,10 @@ export default {
     },
 
     handleClose() {
-      this.accessoryTFs = false
+      this.dialogViewSpareMoney = false
+    },
+    handleClose1() {
+      this.accesscard = false
     },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
@@ -467,6 +523,14 @@ export default {
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
           this.contractList = response
+          for (var i = 0; i < response.records.length; i++) {
+            var arr = 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
+            }
+          }
         })
     },
     // 上传附件
@@ -518,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')
@@ -529,7 +590,7 @@ export default {
       } else {
         this.accessoryTFs = true
       }
-      this.appendixIdss = row.addressUrlArray
+      this.appendixIdss = row.addressUrl.split(',')
     },
     handleExamine(row) {
       console.log(row)
@@ -920,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

@@ -520,7 +520,7 @@
         placeholder="请输入备注信息，不超过200字"
         maxlength="200"
       />
-      <ws-upload
+      <!-- <ws-upload
         ref="upload"
         table-name="maintain_work_order"
         oss-key="mainPlan"
@@ -531,7 +531,57 @@
         @uploadSuccess="uploadSuccess"
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
+      /> -->
+      <!-- -------------- -->
+      <!-- <el-upload
+          action="https://www.zthymaoyi.com/upload/admin"
+          :show-file-list="false"
+          :on-success="
+            (res, file) => {
+              uploadSuccessHandle(res)
+            }
+          "
+          class="avatar-uploader"
+          accept=".jpg, .jpeg, .png, .gif, .pdf, .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>
+        </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
@@ -545,8 +595,6 @@
   </div>
 </template>
 <script>
-//  import { getVesselOne } from '@/model/procurement/basic'
-//  import { dayjs } from 'base-core-lib'
 import {
   packList,
   addList,
@@ -628,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' },
@@ -650,6 +689,8 @@ export default {
       },
       selectIntendedShip: {},
       interviewTypeList: {},
+      addressUrls: [],
+      fileList:[],
     }
   },
   activated() {
@@ -674,6 +715,9 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    close(index) {
+      this.addressUrls.splice(index, 1)
+    },
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       if (val) {
@@ -744,15 +788,10 @@ export default {
         })
     },
     // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-
-      // this.deptBudgetList.
-      // this.formData.append('files', files)
-      // this.feedbackObj.uploadNameAttachment = data.appendixName
-      // this.feedbackObj.pathUploadAttachment = data.appendixPath
-      // // this.newAppendixs = files
-      // this.onChangeFlag = true
+    uploadSuccessHandle(e) {
+      console.log(e)
+      this.addressUrls.push(e.url)
+      // this.deptBudgetList.addressUrl = this.addressUrls.toString
     },
     onChange(files) {
       this.fileNum = files
@@ -1223,22 +1262,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()
 
           addList(this.deptBudgetList)
             .toPromise()
@@ -1270,15 +1320,6 @@ export default {
       this.$refs[deptBudgetList].resetFields()
     },
     addClick() {
-      // let [flag, constValue, constKey] = ['check', '', '']
-      // let obj = { flag, constValue, constKey }
-      // let objAdd = { flag: 'add', constValue: '新增项目', constKey: '' }
-      // let result = this.unitList.filter((item, val, arr) => {
-      //   return item.id != '1'
-      // })
-      // result.push(obj)
-      // result.push(objAdd)
-      // this.unitList = result
       this.unitList.push({
         flag: 'add',
         constValue: '',
@@ -1286,8 +1327,6 @@ export default {
       })
     },
     saveClick(item, index) {
-      console.log(item)
-
       if (Object.is(item.id, 1)) {
         return
       }
@@ -1325,16 +1364,6 @@ export default {
           })
       }
     },
-    // selectContract(val) {
-    //   let key = this.unitList.find((item) => item.constValue === val).constKey
-    //   this.pleaseChoose = val
-    // },
-
-    handleExamine() {},
-    approve() {},
-    // returnsales() {
-    //   this.$router.push({ path: 'purchaseContract' })
-    // },
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
         if (this.ChapterTwoList[i].constValue == e) {
@@ -1611,7 +1640,32 @@ 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 {
+  width: 100%;
+  display: flex;
+  margin-top: 10px;
+}
+.addressUrls-item {
+  position: relative;
+  display: flex;
+}
+.icon-guanbi {
+  position: absolute;
+  right: 8px;
+}
+.addressUrl {
+  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,17 +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
+        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>
       </base-card>
     </ws-form>
     <div style="text-align: right; padding: 10px">
@@ -568,6 +574,9 @@ export default {
       },
       acceptanceCheck: {},
       compId: sessionStorage.getItem('ws-pf_compId'),
+      addressUrls:[],
+      addressUrl:'',
+      fileList:[],
     }
   },
 
@@ -582,6 +591,9 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    close(index) {
+      this.addressUrls.splice(index, 1)
+    },
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       if (val) {
@@ -664,6 +676,11 @@ export default {
           } else if (this.deptBudgetList.deliverType == 2) {
             this.deptBudgetList.deliverType1 = '对方送货'
           }
+          if(this.deptBudgetList.addressUrl != null){
+            this.addressUrls = this.deptBudgetList.addressUrl.split(",")
+            this.fileList = this.deptBudgetList.addressUrl.split(",")
+          }
+          
         })
       // 包装方式
       packList({ constId: 'CON1' })
@@ -693,15 +710,6 @@ export default {
         })
     },
     addClick() {
-      // let [flag, constValue, constKey] = ['check', '', '']
-      // let obj = { flag, constValue, constKey }
-      // let objAdd = { flag: 'add', constValue: '新增项目', constKey: '' }
-      // let result = this.unitList.filter((item, val, arr) => {
-      //   return item.id != '1'
-      // })
-      // result.push(obj)
-      // result.push(objAdd)
-      // this.unitList = result
       this.unitList.push({
         flag: 'add',
         constValue: '',
@@ -709,15 +717,9 @@ export default {
       })
     },
     // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-
-      // this.deptBudgetList.
-      // this.formData.append('files', files)
-      // this.feedbackObj.uploadNameAttachment = data.appendixName
-      // this.feedbackObj.pathUploadAttachment = data.appendixPath
-      // // this.newAppendixs = files
-      // this.onChangeFlag = true
+    uploadSuccessHandle(e) {
+      this.addressUrl += e.url+""
+       this.addressUrls.push(this.addressUrl.split(","))
     },
     getUnitList() {
       xiala({
@@ -1306,6 +1308,7 @@ export default {
           }else{
                this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
           }
+          this.deptBudgetList.addressUrl = this.addressUrls.toString()
           editInfo(this.deptBudgetList)
             .toPromise()
             .then((response) => {
@@ -1549,4 +1552,29 @@ export default {
     position: relative;
     display: none;
 }
+.addressUrls {
+  width: 100%;
+  display: flex;
+  margin-top: 10px;
+}
+.addressUrls-item {
+  position: relative;
+  display: flex;
+}
+.icon-guanbi {
+  position: absolute;
+  right: 8px;
+}
+.addressUrl {
+  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

@@ -33,7 +33,9 @@
         >
       </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=""
@@ -46,7 +48,7 @@
             :key="item.value"
             :label="item.value"
             :value="item.value"
-            style="color: #8890B1;"
+            style="color: #8890b1"
           />
         </ws-select>
 
@@ -69,11 +71,7 @@
           type="input"
           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"
@@ -190,7 +188,6 @@
             @click="editClick(scope.row)"
             alt=""
           />
-          <!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
         </template>
       </el-table-column>
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
@@ -221,8 +218,8 @@
             src="../../../public/img/chakan.png"
             @click="handleExamine(scope.row)"
             v-hasPermission="
-            `contractManagement.salesContract.salesContractInfo.view`
-          "
+              `contractManagement.salesContract.salesContractInfo.view`
+            "
             alt=""
           />
           <img
@@ -231,8 +228,8 @@
             style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/bianji.png"
             v-hasPermission="
-            `contractManagement.salesContract.salesContractInfo.edit`
-          "
+              `contractManagement.salesContract.salesContractInfo.edit`
+            "
             @click="handleEdit(scope.row)"
             alt=""
           />
@@ -247,8 +244,8 @@
             "
             src="../../../public/img/shanchu.png"
             v-hasPermission="
-            `contractManagement.salesContract.salesContractInfo.delete`
-          "
+              `contractManagement.salesContract.salesContractInfo.delete`
+            "
             @click="handleDelete(scope.row)"
             alt=""
           />
@@ -264,24 +261,35 @@
       :total="deptBudgetTotal"
     >
     </el-pagination>
-    <!-- 附件弹框 -->
-    <WinseaContentModal
+     <WinseaContentModal
       v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
       @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>
-      <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"
-      />
+      <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>
@@ -341,6 +349,7 @@ export default {
       categoryIndex: 0,
       rulesVendor: {},
       size: 10,
+      appendixIdss:[],
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       date: {
@@ -356,12 +365,16 @@ export default {
         },
       },
       accessoryTFs: false,
+      accesscard: false,
+      accessurl: '',
+      fileList:[],
       taskTypeList: [
         { value: '未完成', type: 1 },
         { value: '已完成', type: 2 },
         { value: '未回款', type: 3 },
         { value: '全部合同', type: '' },
       ],
+      addressUrls: [],
       pickerOptions: {
         shortcuts: [
           {
@@ -440,8 +453,12 @@ export default {
       }
       return fmt
     },
+
     handleClose() {
-      this.accessoryTFs = false
+      this.dialogViewSpareMoney = false
+    },
+    handleClose1() {
+      this.accesscard = false
     },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
@@ -489,6 +506,14 @@ export default {
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
           this.contractList = response
+          for (var i = 0; i < response.records.length; i++) {
+            var arr = 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
+            }
+          }
         })
     },
     // 上传附件
@@ -542,10 +567,7 @@ export default {
     },
     // receiveAttachmentPath
     fujian(row) {
-      if (
-        row.addressUrl === null ||
-        row.addressUrl === ''
-      ) {
+      if (row.addressUrl === null || row.addressUrl === '') {
         EventBus.$emit(
           'warning',
           this.$t('system.noticeCircular.NoInformation')
@@ -553,7 +575,7 @@ export default {
       } else {
         this.accessoryTFs = true
       }
-      this.appendixIdss = row.addressUrl
+      this.appendixIdss = row.addressUrl.split(',')
     },
     handleExamine(row) {
       this.$router.push({
@@ -621,11 +643,14 @@ export default {
       var handleDelete = ' '
       if (row.handleDelete == '') {
       }
-      this.$confirm(`删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      })
+      this.$confirm(
+        `删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？`,
+        {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }
+      )
         .then(() => {
           deletecontract({ id: row.id })
             .toPromise()
@@ -950,7 +975,6 @@ export default {
     width: 351px;
     height: 20px;
     font-size: 14px;
-    font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
     color: #191919;
     line-height: 20px;
@@ -963,7 +987,7 @@ export default {
     border-radius: 4px;
   }
 }
-/deep/.typeselect .el-input__inner{
-   color: #8890B1;
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
 }
 </style>

src/views/contractManagement/salesContractAdd.vue

@@ -555,18 +555,54 @@
           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, .pdf, .doc, .zip, .rar"
-        />
+        <!-- <el-upload
+          action="https://www.zthymaoyi.com/upload/admin"
+          :show-file-list="false"
+          :on-success="
+            (res, file) => {
+              uploadSuccessHandle(res)
+            }
+          "
+          class="avatar-uploader"
+          accept=".jpg, .jpeg, .png,.gif, .pdf, .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>
+        </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">
@@ -593,6 +629,7 @@ import {
 } from '@/model/contarct/index'
 import WsUpload from '@/components/WsUpload'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import thirdPartyInspectionReportAddVue from '../system/shipInspection/thirdPartyInspectionReportAdd.vue'
 
 export default {
   name: 'viewSpareMoney',
@@ -638,6 +675,7 @@ export default {
       goodnameList: [],
       gradeList: [],
       ChapterTwoList: [],
+      addressUrls: [],
       deptBudgetList: {
         deliverType: '1',
         finalTradingVolume: 0,
@@ -645,6 +683,7 @@ export default {
           goodsName: '',
         },
         contractProcessInfo: {},
+        addressUrl: '',
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -664,6 +703,7 @@ export default {
       },
       selectIntendedShip: {},
       interviewTypeList: {},
+      fileList:[],
     }
   },
   activated() {
@@ -682,6 +722,9 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    close(index) {
+      this.addressUrls.splice(index, 1)
+    },
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {
       this.dialogViewSpareMoney = false
@@ -724,15 +767,9 @@ export default {
         })
     },
     // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-
-      // this.deptBudgetList.
-      // this.formData.append('files', files)
-      // this.feedbackObj.uploadNameAttachment = data.appendixName
-      // this.feedbackObj.pathUploadAttachment = data.appendixPath
-      // // this.newAppendixs = files
-      // this.onChangeFlag = true
+    uploadSuccessHandle(e) {
+      this.addressUrls.push(e.url)
+      this.deptBudgetList.addressUrl = this.addressUrls.toString
     },
     onChange(files) {
       this.fileNum = files
@@ -1220,27 +1257,36 @@ export default {
       }
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
-          this.deptBudgetList.sourceProvince = CodeToText[this.selectedOptions[0]]
+          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.deliveryProvince =
+            CodeToText[this.selectedOptions1[0]]
+          this.deptBudgetList.deliveryCity =
+            CodeToText[this.selectedOptions1[1]]
+
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 1
 
-           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()
           addList(this.deptBudgetList)
             .toPromise()
             .then((response) => {
@@ -1650,4 +1696,29 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
+.addressUrls {
+  width: 100%;
+  display: flex;
+  margin-top: 10px;
+}
+.addressUrls-item {
+  position: relative;
+  display: flex;
+}
+.icon-guanbi {
+  position: absolute;
+  right: 8px;
+}
+.addressUrl {
+  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,18 +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, .pdf, .doc, .zip, .rar"
-        />
+        <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">
@@ -541,8 +546,6 @@
   </div>
 </template>
 <script>
-// import { getVesselOne } from '@/model/procurement/basic'
-// import { dayjs } from 'base-core-lib'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import WsUpload from '@/components/WsUpload'
 import {
@@ -624,6 +627,9 @@ export default {
       ChapterTwoList: {},
       selectIntendedShip: {},
       interviewTypeList: {},
+      addressUrl:'',
+      addressUrls:[],
+      fileList:[]
     }
   },
   activated() {
@@ -637,6 +643,9 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+     close(index) {
+      this.addressUrls.splice(index, 1)
+    },
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {
       this.dialogViewSpareMoney = false
@@ -650,6 +659,11 @@ export default {
     },
     handleChange1(value) {
       this.selectedOptions1 = value
+    },
+      // 上传附件
+    uploadSuccessHandle(e) {
+      this.addressUrl += e.url+""
+       this.addressUrls.push(this.addressUrl.split(","))
     },
     loaddata() {
       // 数据
@@ -688,6 +702,9 @@ export default {
           } else if (this.deptBudgetList.deliverType == 2) {
             this.deptBudgetList.deliverType1 = '对方送货'
           }
+          if(this.deptBudgetList.addressUrl != null){
+            this.addressUrls = this.deptBudgetList.addressUrl.split(",")
+          }
         })
       // 包装方式
       packList({ constId: 'CON1' })
@@ -1311,6 +1328,7 @@ export default {
           } else {
             this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
           }
+          this.deptBudgetList.addressUrl = this.addressUrls.toString()
           editInfo(this.deptBudgetList)
             .toPromise()
             .then((response) => {
@@ -1580,4 +1598,29 @@ export default {
 /deep/.el-textarea__inner {
   color: #8890b1;
 }
+.addressUrls {
+  width: 100%;
+  display: flex;
+  margin-top: 10px;
+}
+.addressUrls-item {
+  position: relative;
+  display: flex;
+}
+.icon-guanbi {
+  position: absolute;
+  right: 8px;
+}
+.addressUrl {
+  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/component/routers/route.js

@@ -116,10 +116,10 @@ const tranManagementRouter = {
     },
     //出入库任务查看
     {
-      path: 'inOutWarehouseTaskEdit',
+      path: 'inOutWarehousetaskEdit',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/inOutWarehouseTaskEdit'),
-      name: 'inOutWarehouseTaskEdit',
+      name: 'inOutWarehousetaskEdit',
       meta: {
         title: 'inOutWarehouseTaskEdit',
         shortcutEntrance: 'tranManagement',
@@ -129,10 +129,10 @@ const tranManagementRouter = {
     },
     //出入库任务添加
     {
-      path: 'tranManagementWarehouseInOutTaskAdd',
+      path: 'tranManagementWarehouseInOuttaskAdd',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskAdd'),
-      name: 'tranManagementWarehouseInOutTaskAdd',
+      name: 'tranManagementWarehouseInOuttaskAdd',
       meta: {
         title: 'tranManagementWarehouseInOutTaskAdd',
         shortcutEntrance: 'tranManagement',
@@ -144,10 +144,10 @@ const tranManagementRouter = {
     },
     //出入库任务编辑
     {
-      path: 'tranManagementWarehouseInOutTaskEdit',
+      path: 'tranManagementWarehouseInOuttaskedit',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskEdit'),
-      name: 'tranManagementWarehouseInOutTaskEdit',
+      name: 'tranManagementWarehouseInOuttaskedit',
       meta: {
         title: 'tranManagementWarehouseInOutTaskEdit',
         shortcutEntrance: 'tranManagement',
@@ -159,7 +159,7 @@ const tranManagementRouter = {
     },
     //出入库任务审核
     {
-      path: 'tranManagementWarehouseInOutTaskaudit',
+      path: 'tranManagementWarehouseInOuttaskaudit',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/taskManagement/tranManagementWarehouseInOutTaskAudit'),
       name: 'tranManagementWarehouseInOutTaskEdit',

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -70,15 +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>
+            <!-- 合同编号 -->
+          <el-form-item label="合同编号" v-if="dataList.taskTypeKey != 3">
             {{dataList.contractNo}}
-            <!-- </el-select> -->
+           
+          </el-form-item>
+           <el-form-item label="移库任务编号" v-if="dataList.taskTypeKey == 3">
+            {{dataList.moveTaskNo}}
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -179,14 +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>
-            {{dataList1.contractNo}}
+          <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">
@@ -355,6 +351,23 @@
           </el-form-item>
         </el-form>
       </div>
+      <el-table
+        class="wenzi"
+        :data="taskhistories"
+        style="width: 80%"
+        height="180"
+      >
+        <el-table-column prop="operatorMajorRoleName" label="审核人">
+        </el-table-column>
+        <el-table-column prop="inOutTaskNo" label="审核结果">
+          <template scope="scope">
+            <span v-if='scope.row.approved'>通过</span>
+            <span v-if='!scope.row.approved'>驳回</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="审核时间"></el-table-column>
+        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+     </el-table>
     </div>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
@@ -367,7 +380,8 @@ import {
   getwarehousename,
   xialaNo,
   addoreditoutput,
-  outexamine
+  outexamine,
+  gettaskhistories
 } from '@/model/tasksport/index'
 import Pagination from '@/components/Pagination'
 import { mapActions, mapGetters, mapState } from 'vuex'
@@ -404,6 +418,7 @@ export default {
       deptBudgetTotal: 0,
       readonly: true,
       currentPage: 1,
+      taskhistories:[],
       pageSize: 10,
       searchType: 1,
       searchKeyWord: '',
@@ -628,6 +643,10 @@ export default {
       return Min + Math.round(Rand * Range)
     },
     getList() {
+      gettaskhistories({businessKey: this.$route.query.businessKey,workflowId: this.$route.query.workflowId}).toPromise()
+          .then((response) => {
+            this.taskhistories=response
+          })
       outexamine({ relevanceId: this.$route.query.relevanceId })
         .toPromise()
         .then(response => {
@@ -637,7 +656,7 @@ export default {
           } else {
             if(response[0].taskTypeKey==2){
               this.dataList1 = response[0]
-              this.dataList = response[0]
+
             }else{
               this.dataList = response[0]
             }
@@ -739,11 +758,7 @@ export default {
   padding: 16px 20px;
 }
 .center {
-  position: relative;
-  top: 50px;
-  width: 40%;
-  height: 2000px;
-  margin: 0 auto;
+  margin: 10px auto;
   margin-right: 180px;
 }
 /deep/.el-form-item__label {
@@ -868,4 +883,7 @@ export default {
   width: 400px;
   height: 20px;
 }
+.wenzi{
+  margin:0 auto;
+}
 </style>

src/views/taskManagement/moveWarehouseTask.vue

@@ -166,9 +166,6 @@
             >
               查看
             </div>
-            <!-- <ws-button class="completed" @click="see(scope.row)">
-              查看
-            </ws-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -390,14 +387,6 @@ export default {
     handleCloe() {
       this.dialogViewSpareMoney = false
     },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
-
   },
 }
 </script>

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -70,7 +70,7 @@
           {{ shipment1.predictDate }}
         </ws-form-item>       
       </ws-info-table>
-      <ws-info-table class="inout">
+      <ws-info-table  v-bind:class="classs1">
         <div class="library">
           <span style="margin-left: 14px">
             入货库：{{ enter.warehouseName }}</span
@@ -279,6 +279,7 @@ export default {
       unitPrice: 0,
       businessDescribe: '',
       count: '0',
+      classs1:'inout',
     }
   },
 
@@ -355,9 +356,10 @@ export default {
             num += this.enter.inOutWarehouseTaskList[i].weight
           }
           this.count = ""+num
+          if(this.enter.inOutType == null && this.enter.agent ==null){
+            this.classs1 = 'inouts'
+          }
         })
-        console.log(this.shipment,"入库对象")
-        console.log(this.shipment == null)
     },
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
@@ -704,7 +706,7 @@ export default {
   width: 95%;
 }
 .flow1 {
-  width: 33.333%;
+  width: 32%;
 }
 /deep/.el-table th > .cell {
   text-align: center;
@@ -748,4 +750,14 @@ export default {
   border-radius: 3px;
   color: #5473e8;
 }
+.inouts{
+  background: #F6F7FB;
+    width: 95%;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
+}
+/deep/.inouts .el-form-item .el-form-item__content,/deep/.inouts .el-form-item .el-form-item__label{
+ background: #F6F7FB;
+}
 </style>

src/views/taskManagement/tranManagementTransport.vue

@@ -101,7 +101,7 @@
         <el-table-column prop="end" class="table_td" label="终点">
           <template slot-scope="scope">
             {{ scope.row.endPrivate }}{{ scope.row.endCity
-            }}{{ scope.row.endArea }}{{ scope.row.endDetailedAddress }}
+            }}{{ scope.row.endArea }}{{ scope.row.endDetailedAddress }}{{scope.row.receiveWarehouse}}
           </template>
         </el-table-column>
 

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -197,10 +197,10 @@
         style="width: 100%"
         class="position"
         v-for="(item, index) in deptBudgetList.tranProcessInfoList"
-        :key="index"
+        :key="item.id"
       >
         <div class="driver">
-          <span>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
+          <span>运输阶段{{ item.key }} {{ item.processNo }}</span>
           <img
             v-if="!endflag"
             width="22"
@@ -223,7 +223,7 @@
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
           >最终阶段</span> -->
           <el-checkbox
-          @change="(val) => engflagchange(val,index)"
+            @change="(val) => engflagchange(val, index)"
             class="endflag"
             true-label="1"
             false-label="0"
@@ -429,6 +429,7 @@ export default {
             receiveDetailedAddress: '',
             sender: '',
             receiver: '',
+            key: 1,
             senderPhone: '',
             receiverPhone: '',
             endFlag: '0',
@@ -648,7 +649,10 @@ export default {
     },
     add(index) {
       this.deptBudgetList.tranProcessInfoList.push({
-        processNo: this.deptBudgetList.taskNo + '-' + this.number,
+        processNo:
+          this.deptBudgetList.taskNo +
+          '-' +
+          (this.deptBudgetList.tranProcessInfoList.length + 1),
         tranType: '汽运',
         tranTypeKey: '1',
         deliveryDateStart: '',
@@ -669,17 +673,25 @@ export default {
         receiveDetailedAddress: '',
         sender: '',
         receiver: '',
+        key: this.deptBudgetList.tranProcessInfoList.length,
         senderPhone: '',
         receiverPhone: '',
         endFlag: '0',
       })
-      this.number++
     },
     del(index) {
       if (this.deptBudgetList.tranProcessInfoList.length > 1) {
         this.deptBudgetList.tranProcessInfoList.splice(index, 1)
       }
-      this.number--
+      for (let i = 0; i < this.deptBudgetList.tranProcessInfoList.length; i++) {
+        this.$set(this.deptBudgetList.tranProcessInfoList[i], 'key', i + 1)
+        this.$set(
+          this.deptBudgetList.tranProcessInfoList[i],
+          'processNo',
+          this.deptBudgetList.taskNo + '-' + (i + 1)
+        )
+      }
+      this.$forceUpdate()
     },
     handleChange(value) {
       this.selectedOptions = value
@@ -931,96 +943,206 @@ export default {
           return
         }
       }
-      this.$confirm(`运输任务提交成功后将派发到物流部门，是否确定提交？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
-            if (valid) {
-              this.deptBudgetList.compId =
-                sessionStorage.getItem('ws-pf_compId')
-              this.deptBudgetList.tranType = this.checkList.toString()
-              this.deptBudgetList.startPrivate =
-                CodeToText[this.selectedOptions[0]]
-              this.deptBudgetList.startCity =
-                CodeToText[this.selectedOptions[1]]
-              this.deptBudgetList.startArea =
-                CodeToText[this.selectedOptions[2]]
-              this.deptBudgetList.tranProcessInfoList[0].sendPrivate =
-                CodeToText[this.selectedOptions[0]]
-              this.deptBudgetList.tranProcessInfoList[0].sendCity =
-                CodeToText[this.selectedOptions[1]]
-              this.deptBudgetList.tranProcessInfoList[0].sendArea =
-                CodeToText[this.selectedOptions[2]]
-              if (this.endflag) {
-                this.deptBudgetList.tranProcessInfoList[
-                  this.deptBudgetList.tranProcessInfoList.length - 1
-                ].receivePrivate = CodeToText[this.selectedOptions1[0]]
-                this.deptBudgetList.tranProcessInfoList[
-                  this.deptBudgetList.tranProcessInfoList.length - 1
-                ].receiveCity = CodeToText[this.selectedOptions1[1]]
-                this.deptBudgetList.tranProcessInfoList[
-                  this.deptBudgetList.tranProcessInfoList.length - 1
-                ].receiveArea = CodeToText[this.selectedOptions1[2]]
-              }
+      if (this.endflag) {
+        this.$confirm(`运输任务提交成功后将派发到物流部门，是否确定提交？`, {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+          .then(() => {
+            this.$refs.deptBudgetList.validate((valid) => {
+              if (valid) {
+                this.deptBudgetList.compId =
+                  sessionStorage.getItem('ws-pf_compId')
+                this.deptBudgetList.tranType = this.checkList.toString()
+                this.deptBudgetList.startPrivate =
+                  CodeToText[this.selectedOptions[0]]
+                this.deptBudgetList.startCity =
+                  CodeToText[this.selectedOptions[1]]
+                this.deptBudgetList.startArea =
+                  CodeToText[this.selectedOptions[2]]
+                this.deptBudgetList.tranProcessInfoList[0].sendPrivate =
+                  CodeToText[this.selectedOptions[0]]
+                this.deptBudgetList.tranProcessInfoList[0].sendCity =
+                  CodeToText[this.selectedOptions[1]]
+                this.deptBudgetList.tranProcessInfoList[0].sendArea =
+                  CodeToText[this.selectedOptions[2]]
+                if (this.endflag) {
+                  this.deptBudgetList.tranProcessInfoList[
+                    this.deptBudgetList.tranProcessInfoList.length - 1
+                  ].receivePrivate = CodeToText[this.selectedOptions1[0]]
+                  this.deptBudgetList.tranProcessInfoList[
+                    this.deptBudgetList.tranProcessInfoList.length - 1
+                  ].receiveCity = CodeToText[this.selectedOptions1[1]]
+                  this.deptBudgetList.tranProcessInfoList[
+                    this.deptBudgetList.tranProcessInfoList.length - 1
+                  ].receiveArea = CodeToText[this.selectedOptions1[2]]
+                }
+                if (
+                  this.deptBudgetList.taskType != '销售出库' ||
+                  this.deptBudgetList.taskType != '贸易服务出库' ||
+                  this.deptBudgetList.taskType != '暂存出库'
+                ){
+                  this.deptBudgetList.endPrivate = CodeToText[this.selectedOptions1[0]]
+                  this.deptBudgetList.endCity = CodeToText[this.selectedOptions1[1]]
+                  this.deptBudgetList.endArea = CodeToText[this.selectedOptions1[2]]
+                }
+                  for (
+                    var i = 0;
+                    i < this.deptBudgetList.tranProcessInfoList.length;
+                    i++
+                  ) {
+                    this.deptBudgetList.tranProcessInfoList[i].sort = i
+                  }
 
-              for (
-                var i = 0;
-                i < this.deptBudgetList.tranProcessInfoList.length;
-                i++
-              ) {
-                this.deptBudgetList.tranProcessInfoList[i].sort = i
+                addtrantask(this.deptBudgetList)
+                  .toPromise()
+                  .then((response) => {
+                    this.$message.success('添加成功')
+                    this.deptBudgetList = {
+                      taskNo: '',
+                      totalStorage: 0,
+                      goodsName: '玉米',
+                      goodsNameKey: 1,
+                      warehouseType: '1',
+                      tranProcessInfoList: [
+                        {
+                          processNo: '',
+                          tranType: '汽运',
+                          deliveryDateStart: '',
+                          deliveryDateEnd: '',
+                          weight: '',
+                          selectedOptions: [],
+                          selectedOptions1: [],
+                          sendPrivate: '',
+                          sendCity: '',
+                          sendArea: '',
+                          receivePrivate: '',
+                          receiveCity: '',
+                          receiveArea: '',
+                          sendDetailedAddress: '',
+                          receiveDetailedAddress: '',
+                          sender: '',
+                          receiver: '',
+                          senderPhone: '',
+                          receiverPhone: '',
+                          contractNo: '',
+                          receiveWarehouse: '',
+                        },
+                      ],
+                    }
+                    this.$router.push({ path: 'tranManagementTransport' })
+                  })
+              } else {
+                EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                return false
               }
-
-              addtrantask(this.deptBudgetList)
-                .toPromise()
-                .then((response) => {
-                  this.$message.success('添加成功')
-                  this.deptBudgetList = {
-                    taskNo: '',
-                    totalStorage: 0,
-                    goodsName: '玉米',
-                    goodsNameKey: 1,
-                    warehouseType: '1',
-                    tranProcessInfoList: [
-                      {
-                        processNo: '',
-                        tranType: '汽运',
-                        deliveryDateStart: '',
-                        deliveryDateEnd: '',
-                        weight: '',
-                        selectedOptions: [],
-                        selectedOptions1: [],
-                        sendPrivate: '',
-                        sendCity: '',
-                        sendArea: '',
-                        receivePrivate: '',
-                        receiveCity: '',
-                        receiveArea: '',
-                        sendDetailedAddress: '',
-                        receiveDetailedAddress: '',
-                        sender: '',
-                        receiver: '',
-                        senderPhone: '',
-                        receiverPhone: '',
-                        contractNo: '',
-                        receiveWarehouse: '',
-                      },
-                    ],
-                  }
-                  this.$router.push({ path: 'tranManagementTransport' })
-                })
-            } else {
-              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              return false
-            }
+            })
           })
+          .catch(() => {
+            return false
+          })
+      } else {
+        this.$confirm(`您还未选择最终阶段，是否确定提交？？`, {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
         })
-        .catch(() => {
-          return false
-        })
+          .then(() => {
+            this.$refs.deptBudgetList.validate((valid) => {
+              if (valid) {
+                this.deptBudgetList.compId =
+                  sessionStorage.getItem('ws-pf_compId')
+                this.deptBudgetList.tranType = this.checkList.toString()
+                this.deptBudgetList.startPrivate =
+                  CodeToText[this.selectedOptions[0]]
+                this.deptBudgetList.startCity =
+                  CodeToText[this.selectedOptions[1]]
+                this.deptBudgetList.startArea =
+                  CodeToText[this.selectedOptions[2]]
+                this.deptBudgetList.tranProcessInfoList[0].sendPrivate =
+                  CodeToText[this.selectedOptions[0]]
+                this.deptBudgetList.tranProcessInfoList[0].sendCity =
+                  CodeToText[this.selectedOptions[1]]
+                this.deptBudgetList.tranProcessInfoList[0].sendArea =
+                  CodeToText[this.selectedOptions[2]]
+                if (this.endflag) {
+                  this.deptBudgetList.tranProcessInfoList[
+                    this.deptBudgetList.tranProcessInfoList.length - 1
+                  ].receivePrivate = CodeToText[this.selectedOptions1[0]]
+                  this.deptBudgetList.tranProcessInfoList[
+                    this.deptBudgetList.tranProcessInfoList.length - 1
+                  ].receiveCity = CodeToText[this.selectedOptions1[1]]
+                  this.deptBudgetList.tranProcessInfoList[
+                    this.deptBudgetList.tranProcessInfoList.length - 1
+                  ].receiveArea = CodeToText[this.selectedOptions1[2]]
+                }
+                 if (
+                  this.deptBudgetList.taskType != '销售出库' ||
+                  this.deptBudgetList.taskType != '贸易服务出库' ||
+                  this.deptBudgetList.taskType != '暂存出库'
+                ){
+                  this.deptBudgetList.endPrivate = CodeToText[this.selectedOptions1[0]]
+                  this.deptBudgetList.endCity = CodeToText[this.selectedOptions1[1]]
+                  this.deptBudgetList.endArea = CodeToText[this.selectedOptions1[2]]
+                }
+
+                for (
+                  var i = 0;
+                  i < this.deptBudgetList.tranProcessInfoList.length;
+                  i++
+                ) {
+                  this.deptBudgetList.tranProcessInfoList[i].sort = i
+                }
+
+                addtrantask(this.deptBudgetList)
+                  .toPromise()
+                  .then((response) => {
+                    this.$message.success('添加成功')
+                    this.deptBudgetList = {
+                      taskNo: '',
+                      totalStorage: 0,
+                      goodsName: '玉米',
+                      goodsNameKey: 1,
+                      warehouseType: '1',
+                      tranProcessInfoList: [
+                        {
+                          processNo: '',
+                          tranType: '汽运',
+                          deliveryDateStart: '',
+                          deliveryDateEnd: '',
+                          weight: '',
+                          selectedOptions: [],
+                          selectedOptions1: [],
+                          sendPrivate: '',
+                          sendCity: '',
+                          sendArea: '',
+                          receivePrivate: '',
+                          receiveCity: '',
+                          receiveArea: '',
+                          sendDetailedAddress: '',
+                          receiveDetailedAddress: '',
+                          sender: '',
+                          receiver: '',
+                          senderPhone: '',
+                          receiverPhone: '',
+                          contractNo: '',
+                          receiveWarehouse: '',
+                        },
+                      ],
+                    }
+                    this.$router.push({ path: 'tranManagementTransport' })
+                  })
+              } else {
+                EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                return false
+              }
+            })
+          })
+          .catch(() => {
+            return false
+          })
+      }
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()

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

@@ -25,7 +25,9 @@
         </ws-button>
       </template>
       <template slot="right">
-        <span style="width: 70px; display: inline-block;color: #8890B1;">状态：</span>
+        <span style="width: 70px; display: inline-block; color: #8890b1"
+          >状态：</span
+        >
         <ws-select
           v-model="searchTypeText"
           placeholder
@@ -38,7 +40,7 @@
             :key="item.value"
             :label="item.value"
             :value="item.value"
-            style="color: #8890B1;"
+            style="color: #8890b1"
           />
         </ws-select>
         <ws-input
@@ -65,7 +67,12 @@
       </template>
     </BaseHeaderLayout>
     <div class="navv">
-      <el-table class="wenzi" :data="gainList.records" style="width: 100%;" height="780">
+      <el-table
+        class="wenzi"
+        :data="gainList.records"
+        style="width: 100%"
+        height="780"
+      >
         <el-table-column type="index" label="序号">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -73,13 +80,56 @@
           </template>
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
-        <el-table-column prop="contractNo" label="合同编号" width="80"></el-table-column>
-        <el-table-column prop="warehouseName" class="table_td" label="库房名"></el-table-column>
-        <el-table-column prop="inOutType" class="table_td" label="出入库类型"></el-table-column>
-        <el-table-column prop="goodsName" class="table_td" label="货名"></el-table-column>
-        <el-table-column prop="weight" class="table_td" label="重量（吨）"></el-table-column>
-        <el-table-column prop="predictDate" class="table_td" label="预计日期"></el-table-column>
-        <el-table-column prop="publisher" class="table_td" label="发布者"></el-table-column>
+        <el-table-column prop="contractNo" label="合同编号" width="80">
+          <!-- <template scope="scope">
+            <div
+              v-if="
+                scope.row.inOutType == '移库入库' ||
+                scope.row.inOutType == '移库出库'
+              "
+            >
+              {{ scope.row.moveTaskNo }}
+            </div>
+            <div
+              v-if="
+                scope.row.inOutType != '移库入库' ||
+                scope.row.inOutType != '移库出库'
+              "
+            >
+              {{ scope.row.contractNo }}
+            </div>
+          </template> -->
+        </el-table-column>
+        <el-table-column
+          prop="warehouseName"
+          class="table_td"
+          label="库房名"
+        ></el-table-column>
+        <el-table-column
+          prop="inOutType"
+          class="table_td"
+          label="出入库类型"
+        ></el-table-column>
+        <el-table-column
+          prop="goodsName"
+          class="table_td"
+          label="货名"
+        ></el-table-column>
+        <el-table-column
+          prop="weight"
+          class="table_td"
+          label="重量（吨）"
+        ></el-table-column>
+        <el-table-column
+          prop="predictDate"
+          class="table_td"
+          label="预计日期"
+        ></el-table-column>
+        <el-table-column
+          prop="publisher"
+          class="table_td"
+          label="发布者"
+        ></el-table-column>
         <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
@@ -91,19 +141,33 @@
             >
               <template>
                 <span slot="reference">
-                  <span v-if="scope.row.taskStatus == '待审核'" class="executory"></span>
-                  <span v-if="scope.row.taskStatus == '执行中'" class="inExecution"></span>
-                  <span v-if="scope.row.taskStatus == '已完成'" class="done"></span>
+                  <span
+                    v-if="scope.row.taskStatus == '待审核'"
+                    class="executory"
+                  ></span>
+                  <span
+                    v-if="scope.row.taskStatus == '执行中'"
+                    class="inExecution"
+                  ></span>
+                  <span
+                    v-if="scope.row.taskStatus == '已完成'"
+                    class="done"
+                  ></span>
                   {{ scope.row.taskStatus }}
                 </span>
               </template>
               <div>
                 <p style="margin-top: 0; padding-left: 10px">操作历史</p>
                 <div v-for="(item, index) in historyList" class="flex">
-                  <div class="vertical-text vertical-text-left">{{ item.updateDate }}</div>
+                  <div class="vertical-text vertical-text-left">
+                    {{ item.updateDate }}
+                  </div>
                   <div>
                     <div class="vertical-circle"></div>
-                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
+                    <div
+                      v-if="index != historyList.length - 1"
+                      class="vertical-line"
+                    ></div>
                   </div>
                   <div class="vertical-text">
                     {{ item.operateUser }}
@@ -114,6 +178,7 @@
               </div>
             </el-popover>
             <img
+            v-if='scope.row.taskStatus=="执行中"'
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
@@ -123,45 +188,63 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="establishDate" class="table_td" label="创建时间"></el-table-column>
+        <el-table-column
+          prop="establishDate"
+          class="table_td"
+          label="创建时间"
+        ></el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <div
-              class="record"
+            <span class="corles"
               @click="nocomplete(scope.row)"
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.View`
               "
-            >查看</div>
-            <div
+              >查看</span
+            >
+            <el-divider
+              direction="vertical"
+              v-if="scope.row.taskStatus == '待审核'"
+            ></el-divider>
+            <span class="corles"
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.audit`
               "
               v-if="scope.row.taskStatus == '待审核'"
-              class="adjustment"
               @click="audit(scope.row)"
-            >审核</div>
-            <div
+              >审核</span
+            >
+            <el-divider
+              direction="vertical"
+              class="divider"
+              v-if="
+                scope.row.taskStatus == '待审核'||scope.row.taskStatus == '执行中' ||
+                scope.row.taskStatus == '已驳回'
+              "
+            ></el-divider>
+            <span class="corles"
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.edit`
               "
               v-if="
-                scope.row.taskStatus == '执行中' ||
+                scope.row.taskStatus == '待审核' ||scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
               "
-              class="record"
               @click="delivery(scope.row)"
-            >编辑</div>
-            <div
+              >编辑</span
+            >
+            <el-divider
+              direction="vertical"
+              v-if="scope.row.taskId == null"
+            ></el-divider>
+            <span class="corles"
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
               "
-              v-if="
-                scope.row.taskId==null
-              "       
-              class="adjustment"
+              v-if="scope.row.taskId == null"
               @click="deleteclick(scope.row)"
-            >删除</div>
+              >删除</span
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -186,7 +269,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination
+    Pagination,
   },
   watch: {
     vesselId(val) {
@@ -194,7 +277,7 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    }
+    },
   },
   data() {
     return {
@@ -223,7 +306,7 @@ export default {
         { value: '执行中', type: 3 },
         { value: '已驳回', type: 2 },
         { value: '已完成', type: 4 },
-        { value: '全部任务', type: '' }
+        { value: '全部任务', type: '' },
       ],
       // 提交类型
       submitType: true,
@@ -235,21 +318,25 @@ export default {
       deptCircularPage: {},
       historyList: [],
       pickerBeginDateBefore: {
-        disabledDate: time => {
+        disabledDate: (time) => {
           return time.getTime() > Date.now()
-        }
+        },
       },
-      accessoryTFs: false
+      accessoryTFs: false,
     }
   },
   activated() {
     this.getList()
     this.showType = this.isShow
   },
+  mounted() {
+    this.getList()
+    this.showType = this.isShow
+  },
   methods: {
     //添加
     handleAdd() {
-      this.$router.push({ path: 'tranManagementWarehouseInOutTaskAdd' })
+      this.$router.push({ path: 'tranManagementWarehouseInOuttaskAdd' })
     },
     //查找
     lookUp() {
@@ -270,17 +357,16 @@ export default {
       this.$confirm(text, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       })
         .then(() => {
-          console.log(row)
           outdelete({
             id: row.id,
             relevanceId: row.relevanceId,
-            inOutFlag: row.inOutFlag
+            inOutFlag: row.inOutFlag,
           })
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.getList()
             })
         })
@@ -294,11 +380,10 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord
+        searchKeyWord: this.searchKeyWord,
       })
         .toPromise()
-        .then(response => {
-          console.log(response)
+        .then((response) => {
           this.gainList = response
           this.currentPage = response.current
           this.pageSize = response.size
@@ -308,19 +393,21 @@ export default {
     //编辑
     delivery(item) {
       this.$router.push({
-        path: 'tranManagementWarehouseInOutTaskEdit',
+        path: 'tranManagementWarehouseInOuttaskedit',
         query: {
-          relevanceId: item.relevanceId
-        }
+          relevanceId: item.relevanceId,
+        },
       })
     },
     audit(item) {
       this.$router.push({
-        path: 'tranManagementWarehouseInOutTaskaudit',
+        path: 'tranManagementWarehouseInOuttaskaudit',
         query: {
           relevanceId: item.relevanceId,
-          taskId: item.taskId
-        }
+          taskId: item.taskId,
+          businessKey:item.id,
+          workflowId:item.workflowId
+        },
       })
     },
     getSpanArr(data) {
@@ -357,10 +444,12 @@ export default {
     //查看//传参
     nocomplete(row) {
       this.$router.push({
-        path: 'inOutWarehouseTaskEdit',
+        path: 'inOutWarehousetaskEdit',
         query: {
-          relevanceId: row.relevanceId
-        }
+          relevanceId: row.relevanceId,
+          businessKey:row.id,
+          workflowId:row.workflowId
+        },
       })
     },
     dateFormat(fmt, date) {
@@ -369,7 +458,7 @@ export default {
         'Y+': date.getFullYear().toString(), // 年
         'm+': (date.getMonth() + 1).toString(), // 月
         'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString() // 时
+        'H+': date.getHours().toString(), // 时
         // "M+": date.getMinutes().toString(),         // 分
         // "S+": date.getSeconds().toString()          // 秒
         // 有其他格式化字符需求可以继续添加，必须转化成字符串
@@ -409,19 +498,19 @@ export default {
       this.$confirm(`是否将状态改为${status}`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       })
         .then(() => {
           movestates({ id: row.id })
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.$notify.success({
                 title: '成功',
-                message: '状态修改成功'
+                message: '状态修改成功',
               })
               this.getList()
             })
-            .catch(response => {
+            .catch((response) => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
             })
         })
@@ -439,7 +528,7 @@ export default {
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id }
+        query: { id: row.id },
       })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
@@ -449,15 +538,15 @@ export default {
     history(row) {
       billoperatehis({ id: row.id })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.historyList = response
         })
     },
     find() {
       this.currentPage = 1
       this.getList()
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -503,23 +592,7 @@ export default {
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
 }
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
+
 .el-row {
   height: 50px;
 }
@@ -574,4 +647,8 @@ export default {
 /deep/.typeselect .el-input__inner {
   color: #8890b1;
 }
+.corles{
+  color: #5878E8;
+  font-size: 14px;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -24,16 +24,13 @@
     <div class="basicInformation">
       <div class="annu">
         <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
-        <!-- <el-radio label="1" class="a">出库</el-radio>
-        <el-radio label="2" class="a">入库</el-radio>
-        <el-radio label="3" class="a">移库</el-radio>
-        <el-radio label="4" class="a">退库并出库</el-radio> -->
       </el-radio-group>
         <div class="nav">
         <span class="ziti">
           任务类型：
-          <h1 v-if='dataList.inOutType' class="ziti1">{{dataList.inOutType}}</h1>
-          <h1 v-if='dataList1.inOutType' class="ziti1">{{dataList1.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>
@@ -932,17 +929,14 @@ export default {
       this.dataList.inOutFlag=1
       this.dataList1.inOutFlag=2
       if (this.dataList.taskTypeKey == 1) {
-        
-        this.dataList.inOutTaskNo = this.inOutTaskNo
         this.requestadd(this.dataList)
       } else if (this.dataList1.taskTypeKey == 2) {
-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
         this.requestadd(this.dataList1)
       } else if (
         this.dataList.taskTypeKey == 3 ||
         this.dataList.taskTypeKey == 4
       ) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
+
         this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
         if(this.dataList.taskTypeKey == 3){
           this.dataList.businessDescribe=this.dataList1.businessDescribe
@@ -950,7 +944,6 @@ export default {
           this.dataList1.businessDescribe=this.dataList.businessDescribe
         }
         this.requestadd(this.dataList, 'repetition')
-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
         this.dataList1.relevanceId = this.dataList.relevanceId
         if(!this.deletetask){
           this.requestadd(this.dataList1, 'repetition')

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -220,7 +220,6 @@
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { seeCat, packList, feedback } from '@/model/transport/index'
-import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {

src/views/warehouse/warehouseManagementAdd.vue

@@ -180,24 +180,29 @@
             uploadSuccessHandle(res)
           }
         "
-        :on-remove="(value) => {handleRemove(value)}"
         class="avatar-uploader"
         accept=".jpg, .jpeg, .png, .gif"
-        >
-        <el-button  v-show="radio == 1">上传附件</el-button>   
+      >
+        <el-button v-show="radio == 1">上传附件</el-button>
       </el-upload>
       <div class="addressUrls" v-if="addressUrls != null">
-         <div v-for="(item , index) in addressUrls" class="addressUrl" :key="index">
-          <img
-            v-if="addressUrls != null"
-            width="100"
-            height="100"
-            :src="item"
-            alt=""
-          /> 
-       
-          </div> 
+        <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>
+      </div>
       <div style="margin-bottom: 5px" class="small-title">仓库定位</div>
       <map-drag @marker="marker" @selectedAddress="selectedAddress"></map-drag>
     </ws-form>
@@ -244,7 +249,7 @@ export default {
     return {
       deptBudgetList: {
         totalStorage: 0,
-        addressUrl:"",
+        addressUrl: '',
       },
       options_: regionData,
       heightData: '600px',
@@ -302,7 +307,7 @@ export default {
       freightspace: [{ binNumber: '', maxStorage: '', remark: '' }],
       name: '',
       list: [],
-      addressUrls:[],
+      addressUrls: [],
     }
   },
   mounted() {
@@ -318,6 +323,9 @@ export default {
     },
   },
   methods: {
+    close(index) {
+      this.addressUrls.splice(index, 1)
+    },
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       if (val) {
@@ -381,7 +389,7 @@ export default {
     },
     // 上传附件
     uploadSuccessHandle(e) {
-      this.deptBudgetList.addressUrl += e.url+","
+      this.deptBudgetList.addressUrl += e.url + ','
       this.addressUrls.push(e.url)
     },
     onChange(files) {
@@ -1054,11 +1062,19 @@ export default {
 .avatar-uploader {
   margin: 0 5px;
 }
-.addressUrls{
+.addressUrls {
   display: flex;
   margin-top: 10px;
 }
-.addressUrl{
+.addressUrls-item {
+  position: relative;
+      display: flex;
+}
+.icon-guanbi {
+  position: absolute;
+  right: 0;
+}
+.addressUrl {
   margin: 0px 10px;
   border-radius: 3px;
 }

src/views/warehouse/warehouseManagementEdit.vue

@@ -181,17 +181,22 @@
         >
           <el-button  v-if="warehouseType == 1">上传附件</el-button>
         </el-upload>
-        <div class="addressUrls">
-          <div v-for="(items, index) in addressUrls" class="addressUrl">
-            <img
-              v-show="addressUrls.length > 0"
-              width="100"
-              height="100"
-              :src="items"
-              alt=""
-            />
-          </div>
+        <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> 
+          </div>
         <div class="small-title">仓库定位</div>
         <map-drag
           @marker="marker"
@@ -324,6 +329,9 @@ export default {
     },
   },
   methods: {
+    close(index){
+      this.addressUrls.splice(index,1)
+    },
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       if (val) {
@@ -998,4 +1006,11 @@ export default {
   margin: 0 10px;
   border-radius: 3px;
 }
+.addressUrls-item{
+  position:relative;
+}
+.icon-guanbi{
+  position:absolute;
+  right:0;
+}
 </style>