Browse Source

前端sdy

zhongtianhaoyuan 3 years ago
parent
commit
1812e35e48

+ 41 - 3
src/views/contractManagement/purchaseContract.vue

@@ -255,7 +255,7 @@
     >
     >
     </el-pagination>
     </el-pagination>
     <!-- 附件弹框 -->
     <!-- 附件弹框 -->
-    <WinseaContentModal
+    <!-- <WinseaContentModal
       v-model="accessoryTFs"
       v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
       :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose"
       @on-cancel="handleClose"
@@ -272,7 +272,31 @@
         @uploadSuccess="uploadSuccess"
         @uploadSuccess="uploadSuccess"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
         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="accesscard"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose1"
+    >
+      <p>查看附件</p>
+      <img width="100" height="100" :src="accessurl" alt="" />
     </WinseaContentModal>
     </WinseaContentModal>
+    
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
@@ -326,6 +350,9 @@ export default {
       contractType: 2,
       contractType: 2,
       startDate: null,
       startDate: null,
       endDate: null,
       endDate: null,
+      addressUrls:[],
+      accessurl:'',
+      accesscard:false,
       // 提交类型
       // 提交类型
       submitType: true,
       submitType: true,
       deptCircularPage: {},
       deptCircularPage: {},
@@ -397,7 +424,6 @@ export default {
     }
     }
   },
   },
   activated() {
   activated() {
-    console.log(this.$permission('PERMISSIONS.BUYCONTRACTINFO_ADD'))
     //cg.viewBudget
     //cg.viewBudget
     //cg.viewSpareMoney
     //cg.viewSpareMoney
     // this.getVesselData();
     // this.getVesselData();
@@ -429,7 +455,10 @@ export default {
     },
     },
 
 
     handleClose() {
     handleClose() {
-      this.accessoryTFs = false
+      this.dialogViewSpareMoney = false
+    },
+    handleClose1() {
+      this.accesscard = false
     },
     },
     handleSizeChange(val) {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       console.log(`每页 ${val} 条`)
@@ -467,6 +496,15 @@ export default {
           this.deptCircularPage.pageSize = response.size
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
           this.deptBudgetTotal = response.total
           this.contractList = response
           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
+            }
+          }
         })
         })
     },
     },
     // 上传附件
     // 上传附件

+ 58 - 34
src/views/contractManagement/purchaseContractAdd.vue

@@ -520,7 +520,7 @@
         placeholder="请输入备注信息,不超过200字"
         placeholder="请输入备注信息,不超过200字"
         maxlength="200"
         maxlength="200"
       />
       />
-      <ws-upload
+      <!-- <ws-upload
         ref="upload"
         ref="upload"
         table-name="maintain_work_order"
         table-name="maintain_work_order"
         oss-key="mainPlan"
         oss-key="mainPlan"
@@ -531,7 +531,38 @@
         @uploadSuccess="uploadSuccess"
         @uploadSuccess="uploadSuccess"
         @onChange="onChange"
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
         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>
     </ws-form>
     </ws-form>
     <div style="text-align: right; padding: 10px" class="center">
     <div style="text-align: right; padding: 10px" class="center">
       <el-button
       <el-button
@@ -545,8 +576,6 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-//  import { getVesselOne } from '@/model/procurement/basic'
-//  import { dayjs } from 'base-core-lib'
 import {
 import {
   packList,
   packList,
   addList,
   addList,
@@ -650,6 +679,7 @@ export default {
       },
       },
       selectIntendedShip: {},
       selectIntendedShip: {},
       interviewTypeList: {},
       interviewTypeList: {},
+      addressUrls:[],
     }
     }
   },
   },
   activated() {
   activated() {
@@ -674,6 +704,9 @@ export default {
     this.showType = this.isShow
     this.showType = this.isShow
   },
   },
   methods: {
   methods: {
+    close(index) {
+      this.addressUrls.splice(index, 1)
+    },
     dataFilter(val) {
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       this.deptBudgetList.personCharge = val
       if (val) {
       if (val) {
@@ -744,15 +777,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) {
     onChange(files) {
       this.fileNum = files
       this.fileNum = files
@@ -1239,6 +1266,7 @@ export default {
           }else{
           }else{
              this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
              this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
           }
           }
+            this.deptBudgetList.addressUrl = this.addressUrls.toString()
 
 
           addList(this.deptBudgetList)
           addList(this.deptBudgetList)
             .toPromise()
             .toPromise()
@@ -1270,15 +1298,6 @@ export default {
       this.$refs[deptBudgetList].resetFields()
       this.$refs[deptBudgetList].resetFields()
     },
     },
     addClick() {
     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({
       this.unitList.push({
         flag: 'add',
         flag: 'add',
         constValue: '',
         constValue: '',
@@ -1286,8 +1305,6 @@ export default {
       })
       })
     },
     },
     saveClick(item, index) {
     saveClick(item, index) {
-      console.log(item)
-
       if (Object.is(item.id, 1)) {
       if (Object.is(item.id, 1)) {
         return
         return
       }
       }
@@ -1325,16 +1342,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) {
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
         if (this.ChapterTwoList[i].constValue == e) {
         if (this.ChapterTwoList[i].constValue == e) {
@@ -1614,4 +1621,21 @@ export default {
 .el-textarea{
 .el-textarea{
   width: 101%;
   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;
+}
 </style>
 </style>

+ 62 - 20
src/views/contractManagement/purchaseContractEdit.vue

@@ -478,7 +478,7 @@
           placeholder="请输入备注信息,不超过200字"
           placeholder="请输入备注信息,不超过200字"
           maxlength="200"
           maxlength="200"
         />
         />
-        <ws-upload
+        <!-- <ws-upload
           ref="upload"
           ref="upload"
           table-name="maintain_work_order"
           table-name="maintain_work_order"
           oss-key="mainPlan"
           oss-key="mainPlan"
@@ -488,7 +488,38 @@
           :size-limit="size"
           :size-limit="size"
           @uploadSuccess="uploadSuccess"
           @uploadSuccess="uploadSuccess"
           accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
           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, .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>
       </base-card>
       </base-card>
     </ws-form>
     </ws-form>
     <div style="text-align: right; padding: 10px">
     <div style="text-align: right; padding: 10px">
@@ -568,6 +599,8 @@ export default {
       },
       },
       acceptanceCheck: {},
       acceptanceCheck: {},
       compId: sessionStorage.getItem('ws-pf_compId'),
       compId: sessionStorage.getItem('ws-pf_compId'),
+      addressUrls:[],
+      addressUrl:'',
     }
     }
   },
   },
 
 
@@ -582,6 +615,9 @@ export default {
     this.showType = this.isShow
     this.showType = this.isShow
   },
   },
   methods: {
   methods: {
+    close(index) {
+      this.addressUrls.splice(index, 1)
+    },
     dataFilter(val) {
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       this.deptBudgetList.personCharge = val
       if (val) {
       if (val) {
@@ -664,6 +700,9 @@ export default {
           } else if (this.deptBudgetList.deliverType == 2) {
           } else if (this.deptBudgetList.deliverType == 2) {
             this.deptBudgetList.deliverType1 = '对方送货'
             this.deptBudgetList.deliverType1 = '对方送货'
           }
           }
+          if(this.deptBudgetList.addressUrl != null){
+            this.addressUrls = this.deptBudgetList.addressUrl.split(",")
+          }
         })
         })
       // 包装方式
       // 包装方式
       packList({ constId: 'CON1' })
       packList({ constId: 'CON1' })
@@ -693,15 +732,6 @@ export default {
         })
         })
     },
     },
     addClick() {
     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({
       this.unitList.push({
         flag: 'add',
         flag: 'add',
         constValue: '',
         constValue: '',
@@ -709,15 +739,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() {
     getUnitList() {
       xiala({
       xiala({
@@ -1306,6 +1330,7 @@ export default {
           }else{
           }else{
                this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
                this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
           }
           }
+          this.deptBudgetList.addressUrl = this.addressUrls.toString()
           editInfo(this.deptBudgetList)
           editInfo(this.deptBudgetList)
             .toPromise()
             .toPromise()
             .then((response) => {
             .then((response) => {
@@ -1549,4 +1574,21 @@ export default {
     position: relative;
     position: relative;
     display: none;
     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;
+}
 </style>
 </style>

+ 63 - 28
src/views/contractManagement/salesContract.vue

@@ -33,7 +33,9 @@
         >
         >
       </template>
       </template>
       <template slot="right">
       <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
         <ws-select
           v-model="searchTypeText"
           v-model="searchTypeText"
           placeholder=""
           placeholder=""
@@ -46,7 +48,7 @@
             :key="item.value"
             :key="item.value"
             :label="item.value"
             :label="item.value"
             :value="item.value"
             :value="item.value"
-            style="color: #8890B1;"
+            style="color: #8890b1"
           />
           />
         </ws-select>
         </ws-select>
 
 
@@ -69,11 +71,7 @@
           type="input"
           type="input"
           class="findValue"
           class="findValue"
         ></ws-input>
         ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <ws-button
-          class="find"
-          type="primary"
-          @click="find()"
+        <ws-button class="find" type="primary" @click="find()"
           ><img
           ><img
             width="16"
             width="16"
             height="16"
             height="16"
@@ -190,7 +188,6 @@
             @click="editClick(scope.row)"
             @click="editClick(scope.row)"
             alt=""
             alt=""
           />
           />
-          <!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
@@ -221,8 +218,8 @@
             src="../../../public/img/chakan.png"
             src="../../../public/img/chakan.png"
             @click="handleExamine(scope.row)"
             @click="handleExamine(scope.row)"
             v-hasPermission="
             v-hasPermission="
-            `contractManagement.salesContract.salesContractInfo.view`
-          "
+              `contractManagement.salesContract.salesContractInfo.view`
+            "
             alt=""
             alt=""
           />
           />
           <img
           <img
@@ -231,8 +228,8 @@
             style="vertical-align: text-top; margin: 0 6px"
             style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/bianji.png"
             src="../../../public/img/bianji.png"
             v-hasPermission="
             v-hasPermission="
-            `contractManagement.salesContract.salesContractInfo.edit`
-          "
+              `contractManagement.salesContract.salesContractInfo.edit`
+            "
             @click="handleEdit(scope.row)"
             @click="handleEdit(scope.row)"
             alt=""
             alt=""
           />
           />
@@ -247,8 +244,8 @@
             "
             "
             src="../../../public/img/shanchu.png"
             src="../../../public/img/shanchu.png"
             v-hasPermission="
             v-hasPermission="
-            `contractManagement.salesContract.salesContractInfo.delete`
-          "
+              `contractManagement.salesContract.salesContractInfo.delete`
+            "
             @click="handleDelete(scope.row)"
             @click="handleDelete(scope.row)"
             alt=""
             alt=""
           />
           />
@@ -265,7 +262,7 @@
     >
     >
     </el-pagination>
     </el-pagination>
     <!-- 附件弹框 -->
     <!-- 附件弹框 -->
-    <WinseaContentModal
+    <!-- <WinseaContentModal
       v-model="accessoryTFs"
       v-model="accessoryTFs"
       :title="$t('system.noticeCircular.information')"
       :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose"
       @on-cancel="handleClose"
@@ -282,6 +279,30 @@
         @uploadSuccess="uploadSuccess"
         @uploadSuccess="uploadSuccess"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
         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="accesscard"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose1"
+    >
+      <p>查看附件</p>
+      <img width="100" height="100" :src="accessurl" alt="" />
     </WinseaContentModal>
     </WinseaContentModal>
   </div>
   </div>
 </template>
 </template>
@@ -356,12 +377,15 @@ export default {
         },
         },
       },
       },
       accessoryTFs: false,
       accessoryTFs: false,
+      accesscard: false,
+      accessurl: '',
       taskTypeList: [
       taskTypeList: [
         { value: '未完成', type: 1 },
         { value: '未完成', type: 1 },
         { value: '已完成', type: 2 },
         { value: '已完成', type: 2 },
         { value: '未回款', type: 3 },
         { value: '未回款', type: 3 },
         { value: '全部合同', type: '' },
         { value: '全部合同', type: '' },
       ],
       ],
+      addressUrls: [],
       pickerOptions: {
       pickerOptions: {
         shortcuts: [
         shortcuts: [
           {
           {
@@ -440,8 +464,12 @@ export default {
       }
       }
       return fmt
       return fmt
     },
     },
+
     handleClose() {
     handleClose() {
-      this.accessoryTFs = false
+      this.dialogViewSpareMoney = false
+    },
+    handleClose1() {
+      this.accesscard = false
     },
     },
     handleSizeChange(val) {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
       console.log(`每页 ${val} 条`)
@@ -489,6 +517,14 @@ export default {
           this.deptCircularPage.pageSize = response.size
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
           this.deptBudgetTotal = response.total
           this.contractList = response
           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 +578,7 @@ export default {
     },
     },
     // receiveAttachmentPath
     // receiveAttachmentPath
     fujian(row) {
     fujian(row) {
-      if (
-        row.addressUrl === null ||
-        row.addressUrl === ''
-      ) {
+      if (row.addressUrl === null || row.addressUrl === '') {
         EventBus.$emit(
         EventBus.$emit(
           'warning',
           'warning',
           this.$t('system.noticeCircular.NoInformation')
           this.$t('system.noticeCircular.NoInformation')
@@ -621,11 +654,14 @@ export default {
       var handleDelete = ' '
       var handleDelete = ' '
       if (row.handleDelete == '') {
       if (row.handleDelete == '') {
       }
       }
-      this.$confirm(`删除该合同将同时永久删除合同对应的临时仓库相关数据,是否确定删除?`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      })
+      this.$confirm(
+        `删除该合同将同时永久删除合同对应的临时仓库相关数据,是否确定删除?`,
+        {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }
+      )
         .then(() => {
         .then(() => {
           deletecontract({ id: row.id })
           deletecontract({ id: row.id })
             .toPromise()
             .toPromise()
@@ -950,7 +986,6 @@ export default {
     width: 351px;
     width: 351px;
     height: 20px;
     height: 20px;
     font-size: 14px;
     font-size: 14px;
-    font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
     font-weight: 400;
     color: #191919;
     color: #191919;
     line-height: 20px;
     line-height: 20px;
@@ -963,7 +998,7 @@ export default {
     border-radius: 4px;
     border-radius: 4px;
   }
   }
 }
 }
-/deep/.typeselect .el-input__inner{
-   color: #8890B1;
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
 }
 }
 </style>
 </style>

+ 81 - 36
src/views/contractManagement/salesContractAdd.vue

@@ -555,18 +555,37 @@
           placeholder="请输入备注信息,不超过200字"
           placeholder="请输入备注信息,不超过200字"
           maxlength="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>
       </ws-form>
       </ws-form>
     </div>
     </div>
     <div style="text-align: right; padding: 10px" class="center">
     <div style="text-align: right; padding: 10px" class="center">
@@ -593,6 +612,7 @@ import {
 } from '@/model/contarct/index'
 } from '@/model/contarct/index'
 import WsUpload from '@/components/WsUpload'
 import WsUpload from '@/components/WsUpload'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import thirdPartyInspectionReportAddVue from '../system/shipInspection/thirdPartyInspectionReportAdd.vue'
 
 
 export default {
 export default {
   name: 'viewSpareMoney',
   name: 'viewSpareMoney',
@@ -638,6 +658,7 @@ export default {
       goodnameList: [],
       goodnameList: [],
       gradeList: [],
       gradeList: [],
       ChapterTwoList: [],
       ChapterTwoList: [],
+      addressUrls: [],
       deptBudgetList: {
       deptBudgetList: {
         deliverType: '1',
         deliverType: '1',
         finalTradingVolume: 0,
         finalTradingVolume: 0,
@@ -645,6 +666,7 @@ export default {
           goodsName: '',
           goodsName: '',
         },
         },
         contractProcessInfo: {},
         contractProcessInfo: {},
+        addressUrl: '',
       },
       },
       pickerBeginDateBefore: {
       pickerBeginDateBefore: {
         disabledDate: (time) => {
         disabledDate: (time) => {
@@ -682,6 +704,9 @@ export default {
     this.showType = this.isShow
     this.showType = this.isShow
   },
   },
   methods: {
   methods: {
+    close(index) {
+      this.addressUrls.splice(index, 1)
+    },
     // 关闭 dialog时 处理文件url 初始化upload组件
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {
     handleClose() {
       this.dialogViewSpareMoney = false
       this.dialogViewSpareMoney = false
@@ -724,15 +749,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) {
     onChange(files) {
       this.fileNum = files
       this.fileNum = files
@@ -1220,27 +1239,36 @@ export default {
       }
       }
       this.$refs.deptBudgetList.validate((valid) => {
       this.$refs.deptBudgetList.validate((valid) => {
         if (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.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.compId = this.compId
           this.deptBudgetList.contractType = 1
           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)
           addList(this.deptBudgetList)
             .toPromise()
             .toPromise()
             .then((response) => {
             .then((response) => {
@@ -1650,4 +1678,21 @@ export default {
   overflow: scroll;
   overflow: scroll;
   height: 93vh;
   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;
+}
 </style>
 </style>

+ 65 - 5
src/views/contractManagement/salesContractEdit.vue

@@ -519,7 +519,7 @@
           placeholder="请输入备注信息,不超过200字"
           placeholder="请输入备注信息,不超过200字"
           maxlength="200"
           maxlength="200"
         />
         />
-        <ws-upload
+        <!-- <ws-upload
           ref="upload"
           ref="upload"
           table-name="maintain_work_order"
           table-name="maintain_work_order"
           oss-key="mainPlan"
           oss-key="mainPlan"
@@ -529,8 +529,39 @@
           :size-limit="size"
           :size-limit="size"
           @uploadSuccess="uploadSuccess"
           @uploadSuccess="uploadSuccess"
           @onChange="onChange"
           @onChange="onChange"
-          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-        />
+          accept=".jpg, .jpeg, .png,.gif, .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, .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>
       </ws-form>
       </ws-form>
     </div>
     </div>
     <div style="text-align: right; padding: 10px" class="center">
     <div style="text-align: right; padding: 10px" class="center">
@@ -541,8 +572,6 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-// import { getVesselOne } from '@/model/procurement/basic'
-// import { dayjs } from 'base-core-lib'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import WsUpload from '@/components/WsUpload'
 import WsUpload from '@/components/WsUpload'
 import {
 import {
@@ -624,6 +653,8 @@ export default {
       ChapterTwoList: {},
       ChapterTwoList: {},
       selectIntendedShip: {},
       selectIntendedShip: {},
       interviewTypeList: {},
       interviewTypeList: {},
+      addressUrl:'',
+      addressUrls:[],
     }
     }
   },
   },
   activated() {
   activated() {
@@ -637,6 +668,9 @@ export default {
     this.showType = this.isShow
     this.showType = this.isShow
   },
   },
   methods: {
   methods: {
+     close(index) {
+      this.addressUrls.splice(index, 1)
+    },
     // 关闭 dialog时 处理文件url 初始化upload组件
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {
     handleClose() {
       this.dialogViewSpareMoney = false
       this.dialogViewSpareMoney = false
@@ -650,6 +684,11 @@ export default {
     },
     },
     handleChange1(value) {
     handleChange1(value) {
       this.selectedOptions1 = value
       this.selectedOptions1 = value
+    },
+      // 上传附件
+    uploadSuccessHandle(e) {
+      this.addressUrl += e.url+""
+       this.addressUrls.push(this.addressUrl.split(","))
     },
     },
     loaddata() {
     loaddata() {
       // 数据
       // 数据
@@ -688,6 +727,9 @@ export default {
           } else if (this.deptBudgetList.deliverType == 2) {
           } else if (this.deptBudgetList.deliverType == 2) {
             this.deptBudgetList.deliverType1 = '对方送货'
             this.deptBudgetList.deliverType1 = '对方送货'
           }
           }
+          if(this.deptBudgetList.addressUrl != null){
+            this.addressUrls = this.deptBudgetList.addressUrl.split(",")
+          }
         })
         })
       // 包装方式
       // 包装方式
       packList({ constId: 'CON1' })
       packList({ constId: 'CON1' })
@@ -1311,6 +1353,7 @@ export default {
           } else {
           } else {
             this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
             this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
           }
           }
+          this.deptBudgetList.addressUrl = this.addressUrls.toString()
           editInfo(this.deptBudgetList)
           editInfo(this.deptBudgetList)
             .toPromise()
             .toPromise()
             .then((response) => {
             .then((response) => {
@@ -1580,4 +1623,21 @@ export default {
 /deep/.el-textarea__inner {
 /deep/.el-textarea__inner {
   color: #8890b1;
   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;
+}
 </style>
 </style>

+ 0 - 8
src/views/taskManagement/moveWarehouseTask.vue

@@ -387,14 +387,6 @@ export default {
     handleCloe() {
     handleCloe() {
       this.dialogViewSpareMoney = false
       this.dialogViewSpareMoney = false
     },
     },
-    // history(row) {
-    //   billoperatehis({ id: row.id })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.historyList = response
-    //     })
-    // },
-
   },
   },
 }
 }
 </script>
 </script>

+ 16 - 4
src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -70,7 +70,7 @@
           {{ shipment1.predictDate }}
           {{ shipment1.predictDate }}
         </ws-form-item>       
         </ws-form-item>       
       </ws-info-table>
       </ws-info-table>
-      <ws-info-table class="inout">
+      <ws-info-table  v-bind:class="classs1">
         <div class="library">
         <div class="library">
           <span style="margin-left: 14px">
           <span style="margin-left: 14px">
             入货库:{{ enter.warehouseName }}</span
             入货库:{{ enter.warehouseName }}</span
@@ -279,6 +279,7 @@ export default {
       unitPrice: 0,
       unitPrice: 0,
       businessDescribe: '',
       businessDescribe: '',
       count: '0',
       count: '0',
+      classs1:'inout',
     }
     }
   },
   },
 
 
@@ -355,9 +356,10 @@ export default {
             num += this.enter.inOutWarehouseTaskList[i].weight
             num += this.enter.inOutWarehouseTaskList[i].weight
           }
           }
           this.count = ""+num
           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) {
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
@@ -704,7 +706,7 @@ export default {
   width: 95%;
   width: 95%;
 }
 }
 .flow1 {
 .flow1 {
-  width: 33.333%;
+  width: 32%;
 }
 }
 /deep/.el-table th > .cell {
 /deep/.el-table th > .cell {
   text-align: center;
   text-align: center;
@@ -748,4 +750,14 @@ export default {
   border-radius: 3px;
   border-radius: 3px;
   color: #5473e8;
   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>
 </style>

+ 205 - 184
src/views/taskManagement/tranManagementTransportAdd.vue

@@ -223,7 +223,7 @@
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
           >最终阶段</span> -->
           >最终阶段</span> -->
           <el-checkbox
           <el-checkbox
-          @change="(val) => engflagchange(val,index)"
+            @change="(val) => engflagchange(val, index)"
             class="endflag"
             class="endflag"
             true-label="1"
             true-label="1"
             false-label="0"
             false-label="0"
@@ -429,7 +429,7 @@ export default {
             receiveDetailedAddress: '',
             receiveDetailedAddress: '',
             sender: '',
             sender: '',
             receiver: '',
             receiver: '',
-            key:1,
+            key: 1,
             senderPhone: '',
             senderPhone: '',
             receiverPhone: '',
             receiverPhone: '',
             endFlag: '0',
             endFlag: '0',
@@ -649,7 +649,10 @@ export default {
     },
     },
     add(index) {
     add(index) {
       this.deptBudgetList.tranProcessInfoList.push({
       this.deptBudgetList.tranProcessInfoList.push({
-        processNo: this.deptBudgetList.taskNo + '-' + (this.deptBudgetList.tranProcessInfoList.length+1),
+        processNo:
+          this.deptBudgetList.taskNo +
+          '-' +
+          (this.deptBudgetList.tranProcessInfoList.length + 1),
         tranType: '汽运',
         tranType: '汽运',
         tranTypeKey: '1',
         tranTypeKey: '1',
         deliveryDateStart: '',
         deliveryDateStart: '',
@@ -670,7 +673,7 @@ export default {
         receiveDetailedAddress: '',
         receiveDetailedAddress: '',
         sender: '',
         sender: '',
         receiver: '',
         receiver: '',
-        key:this.deptBudgetList.tranProcessInfoList.length,
+        key: this.deptBudgetList.tranProcessInfoList.length,
         senderPhone: '',
         senderPhone: '',
         receiverPhone: '',
         receiverPhone: '',
         endFlag: '0',
         endFlag: '0',
@@ -681,11 +684,14 @@ export default {
         this.deptBudgetList.tranProcessInfoList.splice(index, 1)
         this.deptBudgetList.tranProcessInfoList.splice(index, 1)
       }
       }
       for (let i = 0; i < this.deptBudgetList.tranProcessInfoList.length; i++) {
       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.$set(this.deptBudgetList.tranProcessInfoList[i], 'key', i + 1)
+        this.$set(
+          this.deptBudgetList.tranProcessInfoList[i],
+          'processNo',
+          this.deptBudgetList.taskNo + '-' + (i + 1)
+        )
       }
       }
       this.$forceUpdate()
       this.$forceUpdate()
-      console.log(this.deptBudgetList.tranProcessInfoList)
     },
     },
     handleChange(value) {
     handleChange(value) {
       this.selectedOptions = value
       this.selectedOptions = value
@@ -937,190 +943,205 @@ export default {
           return
           return
         }
         }
       }
       }
-      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.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{
+          .catch(() => {
+            return false
+          })
+      } else {
         this.$confirm(`您还未选择最终阶段,是否确定提交??`, {
         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]]
-              }
+          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
           })
           })
-        })
-        .catch(() => {
-          return false
-        })
       }
       }
     },
     },
     resetForm(deptBudgetList) {
     resetForm(deptBudgetList) {

+ 3 - 6
src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -24,16 +24,13 @@
     <div class="basicInformation">
     <div class="basicInformation">
       <div class="annu">
       <div class="annu">
         <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
         <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>
       </el-radio-group>
         <div class="nav">
         <div class="nav">
         <span class="ziti">
         <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>
         </span>
       </div>
       </div>
       </div>
       </div>

+ 0 - 1
src/views/tranManagement/tranManagementTransporFeedbackLook.vue

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

+ 31 - 28
src/views/warehouse/warehouseManagementAdd.vue

@@ -182,25 +182,27 @@
         "
         "
         class="avatar-uploader"
         class="avatar-uploader"
         accept=".jpg, .jpeg, .png, .gif"
         accept=".jpg, .jpeg, .png, .gif"
-        >
-        <el-button  v-show="radio == 1">上传附件</el-button>   
+      >
+        <el-button v-show="radio == 1">上传附件</el-button>
       </el-upload>
       </el-upload>
       <div class="addressUrls" v-if="addressUrls != null">
       <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 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>
       <div style="margin-bottom: 5px" class="small-title">仓库定位</div>
       <div style="margin-bottom: 5px" class="small-title">仓库定位</div>
       <map-drag @marker="marker" @selectedAddress="selectedAddress"></map-drag>
       <map-drag @marker="marker" @selectedAddress="selectedAddress"></map-drag>
     </ws-form>
     </ws-form>
@@ -247,7 +249,7 @@ export default {
     return {
     return {
       deptBudgetList: {
       deptBudgetList: {
         totalStorage: 0,
         totalStorage: 0,
-        addressUrl:"",
+        addressUrl: '',
       },
       },
       options_: regionData,
       options_: regionData,
       heightData: '600px',
       heightData: '600px',
@@ -305,7 +307,7 @@ export default {
       freightspace: [{ binNumber: '', maxStorage: '', remark: '' }],
       freightspace: [{ binNumber: '', maxStorage: '', remark: '' }],
       name: '',
       name: '',
       list: [],
       list: [],
-      addressUrls:[],
+      addressUrls: [],
     }
     }
   },
   },
   mounted() {
   mounted() {
@@ -321,8 +323,8 @@ export default {
     },
     },
   },
   },
   methods: {
   methods: {
-    close(index){
-      this.addressUrls.splice(index,1)
+    close(index) {
+      this.addressUrls.splice(index, 1)
     },
     },
     dataFilter(val) {
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       this.deptBudgetList.personCharge = val
@@ -387,7 +389,7 @@ export default {
     },
     },
     // 上传附件
     // 上传附件
     uploadSuccessHandle(e) {
     uploadSuccessHandle(e) {
-      this.deptBudgetList.addressUrl += e.url+","
+      this.deptBudgetList.addressUrl += e.url + ','
       this.addressUrls.push(e.url)
       this.addressUrls.push(e.url)
     },
     },
     onChange(files) {
     onChange(files) {
@@ -1060,18 +1062,19 @@ export default {
 .avatar-uploader {
 .avatar-uploader {
   margin: 0 5px;
   margin: 0 5px;
 }
 }
-.addressUrls{
+.addressUrls {
   display: flex;
   display: flex;
   margin-top: 10px;
   margin-top: 10px;
 }
 }
-.addressUrls-item{
-  position:relative;
+.addressUrls-item {
+  position: relative;
+      display: flex;
 }
 }
-.icon-guanbi{
-  position:absolute;
-  right:0;
+.icon-guanbi {
+  position: absolute;
+  right: 0;
 }
 }
-.addressUrl{
+.addressUrl {
   margin: 0px 10px;
   margin: 0px 10px;
   border-radius: 3px;
   border-radius: 3px;
 }
 }