规格

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -309,7 +309,7 @@
                 </ws-form-item>
                 <ws-form-item v-if="serviceManagementType == 1 && deptBudgetList.outType == '汽运'" label="车牌号" span="1"
                   prop="carNo">
-                  <!-- <ws-input :disabled="disabled2"
+                  <ws-input :disabled="disabled2"
                     v-if="carInputStatus"
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
                   <el-select :disabled="disabled2"
@@ -324,8 +324,9 @@
                     class="typeselect" @change="carChange($event, 1)">
                     <el-option v-for="item in carNumberList" :key="item.id" :label="item.carNo" :value="item.carNo" />
                   </el-select>
-                  <el-button @click="editcarStatus" type="text">{{ cartext }}</el-button> -->
-                  <ws-input :disabled="disabled2"
+                  <el-button @click="editcarStatus" type="text">{{ cartext }}</el-button>
+
+                  <!-- <ws-input :disabled="disabled2"
                     v-if="options2.length == 0 && serviceManagementType == 1 && deptBudgetList.inOutType != '移库入库'&&deptBudgetList.inOutType != '退库' || statusTypetext != '初检'||deptBudgetList.inOutType == '退库'&&tranTaskFlag!=1"
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
                   <el-select :disabled="disabled2"
@@ -340,7 +341,8 @@
                     v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect"
                     @change="carChange($event, 0)">
                     <el-option v-for="item in options2" :key="item.constKey" :label="item.carNo" :value="item.carNo" />
-                  </el-select>
+                  </el-select> -->
+
                   <!-- <el-select :disabled="disabled2" v-if="carNumberList.length > 0 && serviceManagementType == 3"
                     filterable clearable v-model="deptBudgetList.carNo"
                     placeholder="请选择车牌号" class="typeselect" @change="carChange($event, 1)">
@@ -413,34 +415,6 @@
                   <ws-input :disabled='recheck' v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
                     size="small" />
                 </ws-form-item>
-                <!-- <ws-form-item label="规格（公斤）" span="1" prop="boxNoOther"
-                  v-if="compName=='辽宁佳屹农商贸有限公司'">
-                  <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.specifications" placeholder="请选择规格"
-                    class="typeselect" >
-                    <el-option label="830" value="830" />
-                    <el-option label="850" value="850" />
-                  </el-select>
-                </ws-form-item>
-                <ws-form-item label="工厂" span="1" prop="titleNoOther"
-                  v-if="compName=='辽宁佳屹农商贸有限公司'">
-                  <ws-input :disabled='recheck' v-model="deptBudgetList.factory" placeholder="请输入工厂" maxlength="30"
-                    size="small" />
-                </ws-form-item>
-                <ws-form-item label="污染件数" span="1" prop="titleNoOther"
-                  v-if="compName=='辽宁佳屹农商贸有限公司'">
-                  <ws-input :disabled='recheck' v-model="deptBudgetList.polluteNum" placeholder="请输入污染件数" maxlength="30"
-                    size="small" />
-                </ws-form-item>
-                <ws-form-item label="污染件数" span="1" prop="titleNoOther"
-                  v-if="compName=='辽宁佳屹农商贸有限公司'">
-                  <ws-input :disabled='recheck' v-model="deptBudgetList.polluteNum" placeholder="请输入污染件数" maxlength="30"
-                    size="small" />
-                </ws-form-item>
-                <ws-form-item label="破损件数" span="1" prop="titleNoOther"
-                  v-if="compName=='辽宁佳屹农商贸有限公司'">
-                  <ws-input :disabled='recheck' v-model="deptBudgetList.wornNum" placeholder="请输入破损件数" maxlength="30"
-                    size="small" />
-                </ws-form-item> -->
               </ws-info-table>
 
               <div class="title"
@@ -576,6 +550,46 @@
                     placeholder="请输入质量扣价" maxlength="40" size="small" />
                 </ws-form-item>
               </ws-info-table>
+              <ws-info-table>
+              <ws-form-item label="规格（公斤）" span="1" prop="boxNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <el-select :disabled='recheck' filterable clearable v-model="deptBudgetList.specifications" placeholder="请选择规格"
+                    class="typeselect" >
+                    <el-option label="830" value="830" />
+                    <el-option label="850" value="850" />
+                  </el-select>
+                </ws-form-item>
+                <ws-form-item label="工厂" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-input :disabled='recheck' v-model="deptBudgetList.factory" placeholder="请输入工厂" maxlength="30"
+                    size="small" />
+                </ws-form-item>
+                <ws-form-item label="污染件数" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-input :disabled='recheck' v-model="deptBudgetList.polluteNum" placeholder="请输入污染件数" maxlength="30"
+                    size="small" />
+                </ws-form-item>
+                
+                <ws-form-item label="破损件数" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-input :disabled='recheck' v-model="deptBudgetList.wornNum" placeholder="请输入破损件数" maxlength="30"
+                    size="small" />
+                </ws-form-item>
+                
+              </ws-info-table>
+              <ws-info-table class='upload-address-wrap'>
+                <ws-form-item class='upload-address' label="污染附件" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-upload ref="upload" :tipstatus='false' :comp-id="compId" :appendix-ids="deptBudgetList.polluteUrl" :size-limit="size"
+                  @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
+                </ws-form-item>
+                <ws-form-item class='upload-address' label="破损附件" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-upload ref="upload1" :tipstatus='false' :comp-id="compId" :appendix-ids="deptBudgetList.wornUrl" :size-limit="size"
+                  @onChange="onChange1" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
+                </ws-form-item>
+              </ws-info-table>
+
               <ws-info-table v-if="zjJurisdiction && statusTypetext == '初检' || statusTypetext != '初检'">
                 <ws-form-item label="净重单价（元/公斤）" span="1" prop="tidalGrainPrice"
                   v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3">
@@ -587,6 +601,7 @@
                   <ws-input type="number" @mousewheel.native.prevent @input="pricechange"
                     v-model="deptBudgetList.dryGrainPrice" placeholder="请输入干粮单价" maxlength="10" size="small" />
                 </ws-form-item>
+                
               </ws-info-table>
               <ws-info-table>
                 <el-form-item class='rememo' v-if='statusTypetext != "初检"' label="备注" span="1" prop="imperfectGrain">
@@ -654,6 +669,7 @@
         <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
     </el-dialog>
+    
   </div>
 </template>
 <script>
@@ -691,9 +707,11 @@ import axios from 'axios'
 import {
   getHp
 } from '@/utils/getHasPermission'
+import WsUpload from '@/components/WsUpload'
 export default {
   components: {
-    inspectInfoPrint
+    inspectInfoPrint,
+    WsUpload
   },
   watch: {
     '$route'(to, from) {
@@ -740,6 +758,7 @@ export default {
       shipInfoList: [],
       cost: '',
       pageSize: 10,
+      size:9,
       cartext:'选择',
       carInputStatus:true,
       isShowPrint: false,
@@ -882,7 +901,8 @@ export default {
       qyJurisdiction: false,
       zjJurisdiction: false,
       fjJurisdiction: false,
-      qrJurisdiction: false
+      qrJurisdiction: false,
+      compId: localStorage.getItem('ws-pf_compId'),
 
     }
   },
@@ -937,6 +957,28 @@ export default {
     }
   },
   methods: {
+    onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.deptBudgetList.polluteUrl = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
+      onChange1() {
+        this.$refs.upload1
+          .handleSaveBill()
+          .then(async response => {
+            this.deptBudgetList.wornUrl = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload1.clearFiles()
+          })
+      },
     editcarStatus(){
       if(this.deptBudgetList.inOutType!='移库入库'&&this.deptBudgetList.inOutType!='退库'){
         if(this.cartext=='选择'){
@@ -4425,4 +4467,14 @@ export default {
 /deep/.el-input.volumeofbusiness .el-input__inner {
   color: red !important;
 }
+/deep/.upload-address-wrap .el-form-item  .el-form-item__content{
+  height:300px;
+  align-items: flex-start;
+}
+/deep/.ws-upload{
+  overflow-x:scroll;
+}
+// /deep/.ws-info-table .upload-address.el-form-item .el-form-item__content{
+//   overflow-y:scroll;
+// }
 </style>

src/views/houseSelfCollect/inspectionManagementrecord.vue

@@ -78,6 +78,39 @@
             v-if="scope.row.reInspector && scope.row.qualityInspector != scope.row.reInspector">,{{scope.row.reInspector}}</span>
         </template>
       </el-table-column>
+      <el-table-column v-if="compName=='辽宁佳屹农商贸有限公司'" :key='Math.random()' label="规格（公斤）" width="120">
+      </el-table-column>
+      <el-table-column v-if="compName=='辽宁佳屹农商贸有限公司'" :key='Math.random()' prop="factory" label="工厂"></el-table-column> 
+      <el-table-column v-if="compName=='辽宁佳屹农商贸有限公司'" :key='Math.random()' prop="polluteNum" label="污染件数" width="120">
+      </el-table-column>
+      <el-table-column v-if="compName=='辽宁佳屹农商贸有限公司'" :key='Math.random()' prop="type" label="污染附件">
+        <template slot-scope="scope">
+          <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian(scope.row,0)" alt="" />
+          <span v-if="scope.row.polluteUrlArray != null">
+            {{
+              scope.row.polluteUrlArray.length == 0
+                ? ''
+                : scope.row.polluteUrlArray.length
+            }}
+          </span>
+        </template>
+      </el-table-column> 
+      <el-table-column v-if="compName=='辽宁佳屹农商贸有限公司'" :key='Math.random()' prop="wornNum" label="破损件数" width="120">
+      </el-table-column>
+      <el-table-column v-if="compName=='辽宁佳屹农商贸有限公司'" :key='Math.random()' prop="type" label="破损附件">
+        <template slot-scope="scope">
+          <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian(scope.row,1)" alt="" />
+          <span v-if="scope.row.wornUrlArray != null">
+            {{
+              scope.row.wornUrlArray.length == 0
+                ? ''
+                : scope.row.wornUrlArray.length
+            }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column prop="updateDate" label="质检时间" width="90px"></el-table-column>
       <el-table-column prop="status" label="状态">
         <template slot-scope="scope">
@@ -120,6 +153,11 @@
         :total="deptBudgetTotal">
       </el-pagination>
     </div>
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
+      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+    </WinseaContentModal>
     <!-- </div> -->
   </div>
 </template>
@@ -132,9 +170,11 @@
     getQRcode
   } from '@/model/houseSelfCollect/index'
   import inspectInfoPrint from './component/inspectInfoPrint.vue'
+  import WsUpload from '@/components/WsUpload'
   export default {
     components: {
-      inspectInfoPrint
+      inspectInfoPrint,
+      WsUpload
     },
     watch: {},
     data() {
@@ -161,10 +201,19 @@
         deductWeight: '', //扣重比
         saleLimit: '',
         allowEdit: '0',
-        statusTypetext:'全部'
+        statusTypetext:'全部',
+        accessoryTFs:false,
+        appendixIdss:'',
+        compId: localStorage.getItem('ws-pf_compId'),
+        compName:localStorage.getItem('ws-pf_compName'),
+        date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
       }
     },
     mounted() {
+      console.log()
       this.selectWarehouse()
       let _WarehouseName = localStorage.getItem('houseSelfCollect_house1')
       _WarehouseName = JSON.parse(_WarehouseName)
@@ -174,6 +223,9 @@
     },
     
     methods: {
+      handleClose() {
+        this.dialogViewSpareMoney = false
+      },
       warehousetypechange(status){
         this.serviceManagementType=status
         this.getList()
@@ -203,6 +255,16 @@
       find() {
         this.getList()
       },
+      fujian(row,status) {
+        this.accessoryTFs = true
+        if(status==0){
+          this.appendixIdss = row.polluteUrl
+        }else{
+          this.appendixIdss = row.wornUrl
+        }
+        
+        console.log(this.appendixIdss)
+      },
       inspectInfo(row, index) {
         for (let i = 0; i < this.warehouseList.length; i++) {
           if (this.warehouseName == this.warehouseList[i].value) {
@@ -344,6 +406,20 @@
           })
           .toPromise()
           .then((response) => {
+            if(response.records.length>0){
+             for(var i=0;i<response.records.length;i++){
+              if(response.records[i].polluteUrl){
+                response.records[i].polluteUrlArray=response.records[i].polluteUrl.split(',')
+              }else{
+                response.records[i].polluteUrlArray=[]
+              }
+              if(response.records[i].wornUrl){
+                response.records[i].wornUrlArray=response.records[i].wornUrl.split(',')
+              }else{
+                response.records[i].wornUrlArray=[]
+              }
+             }
+            }
             this.inspect = response.records
             this.deptBudgetTotal = response.total
             // this.$forceUpdate();

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -168,6 +168,45 @@
                 type="number" :disabled="disabled" />
             </ws-form-item>
           </ws-info-table>
+          <ws-info-table>
+              <ws-form-item label="规格（公斤）" span="1" prop="boxNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <el-select :disabled='recheck' filterable clearable v-model="inspect.specifications" placeholder="请选择规格"
+                    class="typeselect" >
+                    <el-option label="830" value="830" />
+                    <el-option label="850" value="850" />
+                  </el-select>
+                </ws-form-item>
+                <ws-form-item label="工厂" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-input v-model="inspect.factory" placeholder="请输入工厂" maxlength="30"
+                    size="small" />
+                </ws-form-item>
+                <ws-form-item label="污染件数" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-input v-model="inspect.polluteNum" placeholder="请输入污染件数" maxlength="30"
+                    size="small" />
+                </ws-form-item>
+                
+                <ws-form-item label="破损件数" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-input v-model="inspect.wornNum" placeholder="请输入破损件数" maxlength="30"
+                    size="small" />
+                </ws-form-item>
+                
+              </ws-info-table>
+              <ws-info-table class='upload-address-wrap'>
+                <ws-form-item class='upload-address' label="污染附件" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-upload ref="upload" :tipstatus='false' :comp-id="compId" :appendix-ids="inspect.polluteUrl" :size-limit="size"
+                  @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
+                </ws-form-item>
+                <ws-form-item class='upload-address' label="破损附件" span="1" prop="titleNoOther"
+                  v-if="compName=='辽宁佳屹农商贸有限公司'">
+                  <ws-upload ref="upload1" :tipstatus='false' :comp-id="compId" :appendix-ids="inspect.wornUrl" :size-limit="size"
+                  @onChange="onChange1" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
+                </ws-form-item>
+              </ws-info-table>
         </ws-form>
         <div class="but">
           <!-- <el-button @click="print" type="primary">提交</el-button> -->
@@ -201,9 +240,11 @@
   import html2canvas from 'html2canvas'
   import axios from 'axios'
   import outInspectPrint from './component/outInspectPrint.vue'
+  import WsUpload from '@/components/WsUpload'
   export default {
     components: {
       outInspectPrint,
+      WsUpload
     },
     watch: {},
     data() {
@@ -233,7 +274,8 @@
         isShowPrint: false,
         printData: {},
         nosuccess: 0,
-        success: 0
+        success: 0,
+        compName:localStorage.getItem('ws-pf_compName'),
       }
     },
     beforeDestroy() {
@@ -304,6 +346,28 @@
         })
     },
     methods: {
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.inspect.polluteUrl = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
+      onChange1() {
+        this.$refs.upload1
+          .handleSaveBill()
+          .then(async response => {
+            this.inspect.wornUrl = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload1.clearFiles()
+          })
+      },
       refreshClick(type) {
         let that = this
         if (type == 1) {
@@ -990,7 +1054,7 @@
     margin-top: 20px;
     background: #FFFFFF;
     border-radius: 4px;
-    height: 300px;
+    height: 630px;
 
     .formList {
       width: 90%;
@@ -1024,4 +1088,11 @@
   /deep/.switchpage.el-pagination .el-select .el-input {
     margin: 0 30px 0 10px;
   }
+  /deep/.upload-address-wrap .el-form-item  .el-form-item__content{
+  height:300px;
+  align-items: flex-start;
+}
+/deep/.ws-upload{
+  overflow-x:scroll;
+}
 </style>

src/views/outboundManagement/outInspectRecord.vue

@@ -48,6 +48,39 @@
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="qualityInspector" label="质检员"></el-table-column>
       <el-table-column prop="updateDate" label="质检时间"></el-table-column>
+      <el-table-column v-if="compName=='辽宁佳屹农商贸有限公司'" :key='Math.random()' label="规格（公斤）" width="120">
+      </el-table-column>
+      <el-table-column v-if="compName=='辽宁佳屹农商贸有限公司'" :key='Math.random()' prop="factory" label="工厂"></el-table-column> 
+      <el-table-column v-if="compName=='辽宁佳屹农商贸有限公司'" :key='Math.random()' prop="polluteNum" label="污染件数" width="120">
+      </el-table-column>
+      <el-table-column v-if="compName=='辽宁佳屹农商贸有限公司'" :key='Math.random()' prop="type" label="污染附件">
+        <template slot-scope="scope">
+          <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian(scope.row,0)" alt="" />
+          <span v-if="scope.row.polluteUrlArray != null">
+            {{
+              scope.row.polluteUrlArray.length == 0
+                ? ''
+                : scope.row.polluteUrlArray.length
+            }}
+          </span>
+        </template>
+      </el-table-column> 
+      <el-table-column v-if="compName=='辽宁佳屹农商贸有限公司'" :key='Math.random()' prop="wornNum" label="破损件数" width="120">
+      </el-table-column>
+      <el-table-column v-if="compName=='辽宁佳屹农商贸有限公司'" :key='Math.random()' prop="type" label="破损附件">
+        <template slot-scope="scope">
+          <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian(scope.row,1)" alt="" />
+          <span v-if="scope.row.wornUrlArray != null">
+            {{
+              scope.row.wornUrlArray.length == 0
+                ? ''
+                : scope.row.wornUrlArray.length
+            }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column prop="status" label="状态"></el-table-column>
       <el-table-column width="300" label="操作">
         <template slot-scope="scope">
@@ -68,6 +101,11 @@
         :total="deptBudgetTotal">
       </el-pagination>
     </div>
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
+      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+    </WinseaContentModal>
   </div>
 </template>
 <script>
@@ -75,9 +113,11 @@
     selectWarehouseSelf,
     getinspectList,
   } from '@/model/outboundManagement/index'
-
+  import WsUpload from '@/components/WsUpload'
   export default {
-    components: {},
+    components: {
+      WsUpload
+    },
     watch: {},
     data() {
       return {
@@ -94,7 +134,11 @@
         inspect: [],
         warehouseList: [],
         cangid: '', //仓库id
-        statusType:'1'
+        statusType:'1',
+        accessoryTFs:false,
+        appendixIdss:'',
+        compId: localStorage.getItem('ws-pf_compId'),
+        compName:localStorage.getItem('ws-pf_compName'),
       }
     },
     activated() {
@@ -102,6 +146,16 @@
       this.showType = this.isShow
     },
     methods: {
+      fujian(row,status) {
+        this.accessoryTFs = true
+        if(status==0){
+          this.appendixIdss = row.polluteUrl
+        }else{
+          this.appendixIdss = row.wornUrl
+        }
+        
+        console.log(this.appendixIdss)
+      },
         returnsales(){
             this.$router.go(-1)
         },
@@ -184,6 +238,20 @@
           })
           .toPromise()
           .then((response) => {
+            if(response.records.length>0){
+             for(var i=0;i<response.records.length;i++){
+              if(response.records[i].polluteUrl){
+                response.records[i].polluteUrlArray=response.records[i].polluteUrl.split(',')
+              }else{
+                response.records[i].polluteUrlArray=[]
+              }
+              if(response.records[i].wornUrl){
+                response.records[i].wornUrlArray=response.records[i].wornUrl.split(',')
+              }else{
+                response.records[i].wornUrlArray=[]
+              }
+             }
+            }
             this.inspect = response.records
             this.deptBudgetTotal = response.total
           })