apply-clients 3.5.4-8 → 3.5.4-80

package/src/filiale/yangchunboneng/android/AppSuperServiceControl.vue

@@ -9,7 +9,7 @@
         <app-take-pic :blobid="selectdata.f_process_id" :defname="selectdata.defname" :isdelete="false" :istakepic="false" :istype="false"></app-take-pic>
       </panel>
       <panel header="附件" :is-open="false" type="primary" v-if="selectdata.f_process_id">
-        <app-upload :blobid="selectdata.f_process_id"  :isdelete="true" ></app-upload>
+        <app-upload :blobid="selectdata.f_process_id" :pblobid="selectdata.f_parent_process_id" :isdelete="true" ></app-upload>
       </panel>
     </accordion>
   </div>

package/src/filiale/yangchunboneng/android/AppUpload.vue

@@ -25,15 +25,39 @@
         <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click.prevent="getFiles">搜索</button>
       </div>
       <div  style="overflow: scroll;display: flex;flex-wrap: wrap;">
-        <div class=" showData" v-for="(index,file) in fileList">
-            <img-self :src="file.f_downloadURL" :width="120" :height="170"></img-self>
-            <img v-if="isdelete" src="../../../../src/assets/删除.png" style="width: 15px;" @click.prevent="delfile(file, index)">
-            <p :title="row.f_uploaddate" class="clears"><strong>上传时间：</strong><span>{{ file.f_uploaddate }}</span></p>
-            <p :title="row.fusetype" class="clears"><strong>使用类型：</strong><span>{{ file.fusetype }}</span></p>
-            <p :title="row.defname" class="clears"><strong>上传节点：</strong><span>{{ file.defname }}</span></p>
+        <div class=" showData" v-for="(index,file) in fileList" >
+          <img-self
+            v-if="file.f_filetype=='jpg'|| file.f_filetype =='png' || file.f_filetype == 'gif' || file.f_filetype == 'bmp'"
+            :src="file.f_downloadURL" :width="120" :height="170"></img-self>
+          <img  style="width: -webkit-fill-available" v-if="file.f_filetype === 'pdf'" src="../../../components/image/pdf.jpg" alt="" :width="120" :height="170"/>
+          <img  style="width: -webkit-fill-available"  v-if="file.f_filetype === 'xls'||file.f_filetype === 'xlsx'" src="../../../components/image/excel.jpg" alt="" :width="120" :height="170"/>
+          <img  style="width: -webkit-fill-available" v-if="file.f_filetype === 'doc'||file.f_filetype === 'docx'" src="../../../components/image/doc.jpg" alt="" :width="120" :height="170"/>
+          <img  style="width: -webkit-fill-available" v-if="file.f_filetype === 'dwg'" src="../../../components/image/dwg.jpg" alt="" :width="120" :height="170"/>
+          <img  style="width: -webkit-fill-available"  v-if="file.f_filetype === 'dxf'" src="../../../components/image/dxf.png" alt=""  :width="120" :height="170"/>
+          <img  v-if="isdelete" src="../../../../src/assets/删除.png" style="width: 15px;" @click.prevent="delfile(file, index)">
+          &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+          <img v-if="isdelete" src="../../../../src/assets/下载.png" style="width: 15px;" @click.prevent="dowloadfile(file, index)">
+          <p :title="row.f_uploaddate" class="clears"><strong>上传时间：</strong><span>{{ file.f_uploaddate }}</span></p>
+          <p :title="row.fusetype" class="clears"><strong>使用类型：</strong><span>{{ file.fusetype }}</span></p>
+          <p :title="row.defname" class="clears"><strong>上传节点：</strong><span>{{ file.defname }}</span></p>
         </div>
       </div>
     </div>
+    <modal v-if="showModal" :show.sync="showModal" v-ref:modal :large="true"
+           :backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeM"><span>&times;</span></button>
+        <h4 class="modal-title" style="color: red">请复制链接到浏览器下载</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <span>{{linke}}</span>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <template >
+          <button type="button" class="btn btn-primary" @click="closeM">关闭</button>
+        </template>
+      </footer>
+    </modal>
   </div>
 </template>
 
@@ -43,18 +67,58 @@ import {guid, toStandardTimeString} from '../../../components/Util'
 import Vue from 'vue'
 export default {
   title: '附件',
-  props: ['blobid', 'isdelete'],
+  props: ['blobid', 'isdelete','pblobid', 'defname'],
   data () {
     return {
       fileList: [],
       type:'',
-      defname:''
+      defname:'',
+      linke:'',
+      showModal: false,
     }
   },
   ready () {
     this.getFiles()
   },
   methods: {
+    closeM(){
+      this. showModal=false
+      this.linke =''
+    },
+    dowloadfile(file, index){
+      this.showModal = true
+      this.linke = file.f_downloadURL
+    },
+    //查询父工程附件
+    async pgetFiles () {
+      if(this.pblobid==''||this.pblobid==null){
+        return
+      }
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_files',
+        condition: `f_blobid = '${this.pblobid}' `
+      }
+      if (this.type){
+        data.condition += `and fusetype = '${this.type}'`
+      }
+      if (this.defname){
+        data.condition += `and defname = '${this.defname}'`
+      }
+      data.condition += ` order by f_uploaddate desc `
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {data: data}, {
+        // let res = await http.load('POST', `rs/sql/apply_singleTable`, {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+
+      for (var i = 0; i < res.data.length; i++) {
+        console.log('-----------地址----------------')
+        console.log(`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`)
+        res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`
+        this.fileList.push(res.data[i])
+      }
+    },
     async getFiles () {
       console.log('----------------开始查询图片----------------')
       this.fileList = []
@@ -63,7 +127,7 @@ export default {
 
       let data = {
         tablename: 't_files',
-        condition: `f_blobid = '${this.blobid}' and f_filetype in ('jpg','png')  `
+        condition: `f_blobid = '${this.blobid}'`
       }
       if (this.type){
         data.condition += `and fusetype = '${this.type}'`
@@ -85,8 +149,13 @@ export default {
       }
 
       this.fileList = res.data
+      this.pgetFiles()
     },
     delfile (file, index) {
+      if (this.defname !== file.defname) {
+        this.$showMessage('当前环节和附件上传节点不一致，无法删除')
+        return
+      }
       this.$resetdelete(`${this.$androidUtil.getProxyUrl()}/rs/entity/t_files`, {id: file.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
         this.$dispatch("delResid", file.id)
         this.getFiles()

package/src/filiale/yangchunboneng/android/MaterIialOne.vue

@@ -18,19 +18,22 @@
         :options='newmaterialnameandcode'
         placeholder='请选择'
         close-on-select
-        align='right'
         :value-single="true"
         @change="changeMaterialName"
       ></v-select>
     </div>
     <div class="y-form-item">
       <label>型号</label>
-      <input class="form-control y-form-item-input"
-             v-model="item.f_typenumber"
-             readonly
-      >
-      <!--      <input type="text" class="form-control y-form-item-input" v-model="item.f_typenumber"
-                   :value.sync="item.f_typenumber" readonly>-->
+      <v-select
+        :width="'70%'"
+        :value.sync="item.f_typenumber"
+        v-model="item.f_typenumber"
+        :options='materialnameandtype'
+        placeholder='请选择'
+        close-on-select
+        @change="changeType"
+        :value-single="true"
+      ></v-select>
     </div>
     <div class="y-form-item">
       <label>单价(元/{{ item.unit }})</label>
@@ -41,7 +44,7 @@
     </div>
     <div class="y-form-item">
       <label>数量</label>
-      <input type="number" class="form-control y-form-item-input" v-model="item.f_material_number" @change="material_number_chenge"
+      <input type="number" class="form-control y-form-item-input" v-model="item.f_material_number"    @change="material_number_chenge"
              :readOnly="item.f_process_id && item.f_state != '未收费' ? true : false">
     </div>
     <div class="y-form-item">
@@ -65,31 +68,40 @@
              :readOnly="item.f_process_id && item.f_state != '未收费' ? true : false">
     </div>
   </div>
-
 </template>
 <script>
 export  default {
-  props:["index",'item','materialnameandcode','typenumbers','newmaterialnameandcode'],
+  props:["index",'item','materialnameandcode','typenumbers','newmaterialnameandcode','newmaterialnameandtype'],
   data(){
     return {
-      materialtypenumber:[]
+      materialtypenumber:[],
+      materialnameandtype:[],
     }
   },
   methods:{
     changeMaterialName(val){
+      this.materialnameandtype=[]
       console.log(val)
       if(val){
-        const res = this.materialnameandcode.filter((item)=>item.label === val)[0]
-        console.log(res)
-        if(res){
-          this.item.f_typenumber = res['value']['materialNumber'].name
-          this.item.unit = res['value']['materialNumber'].unit
-          this.item.f_material_price = res['value']['materialNumber'].price
-          this.item.f_typename = res['value']['typeName'].name
-          this.item.material_type = res['value']['materialNumber'].material_type?res['value']['materialNumber'].material_type:'材料费'
+        for (let i = 0; i < this.newmaterialnameandtype.length; i++){
+
+          if(this.newmaterialnameandtype[i].parent_id == val.id){
+            this.materialnameandtype.push(
+              {
+                label:this.newmaterialnameandtype[i].name,
+                value: this.newmaterialnameandtype[i]
+              }
+            )
+          }
         }
       }
     },
+    changeType(val){
+      this.item.unit =val.unit
+      this.item.f_material_price =val.price
+      this.item.f_typename =val.name
+      this.item.material_type = this.item.f_material_name.name+val.name
+    },
     material_number_chenge(){
       this.$emit('number_chenge')
     },

package/src/filiale/yangchunboneng/android.js

@@ -11,7 +11,7 @@ let specialComp = {
   'app-super-service-control': (resolve) => { require(['./android/AppSuperServiceControl'], resolve) },
   'app-take-pic': (resolve) => { require(['./android/AppTakePic'], resolve) },
   'appinstallation-material': (resolve) => { require(['./android/AppInstallationMaterial'], resolve) },
-  'material-one': (resolve) => { require(['./android/MaterIialOne'], resolve) },
+  'apply-material-one': (resolve) => { require(['./android/MaterIialOne'], resolve) },
   'app-supervisory-cart': (resolve) => { require(['./android/AppSupervisoryCart'], resolve) },
   'app-contract-charge': (resolve) => { require(['./android/AppContractCharge'], resolve) },
   'app-upload': (resolve) => { require(['./android/AppUpload'], resolve) }