Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue

@@ -49,7 +49,7 @@
               <el-table-column label="操作" align="center" width="200">
                 <template slot-scope="scope">
                   <el-button :disabled="scope.row.auditState !== 1" type="primary" size="small" @click="handUpdate(scope.row)">办理</el-button>
-                  <el-button v-show="scope.row.auditState == 3" type="primary" size="mini" @click="handleDownLoad(scope.row)">下载</el-button>
+                  <el-button v-show="scope.row.auditState == 3" type="primary" size="small" @click="handleDownLoad(scope.row)">下载</el-button>
                   <el-button type="primary" size="small" @click="handLook(scope.row)">查看</el-button>
                 </template>
               </el-table-column>

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/receipt.vue

@@ -46,9 +46,9 @@
             <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
               <el-table-column width="50" type="selection" align="center"/>
               <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center"/>
-              <el-table-column label="操作" align="center" width="200">
+              <el-table-column label="操作" align="center" width="180">
                 <template slot-scope="scope">
-                  <el-button v-show="scope.row.auditState == 3" type="primary" size="mini" @click="handleDownLoad(scope.row)">下载</el-button>
+                  <el-button v-show="scope.row.auditState == 3" type="primary" size="small" @click="handleDownLoad(scope.row)">下载</el-button>
                   <el-button type="primary" size="small" @click="handLook(scope.row)">查看</el-button>
                 </template>
               </el-table-column>

yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@@ -328,7 +328,7 @@
                   <i class="add-btn-icon el-icon-plus" style="color: red;font-size:20px" @click="serviceAdd(scope.row)"></i>
                 </template>
                 <template slot-scope="scope">
-                  <i class="el-icon-delete" @click="serviceDelete(scope.$index)"></i>
+                  <i class="el-icon-delete" @click="serviceDelete(scope.row.serviceItem, scope.$index)"></i>
                 </template>
               </el-table-column>
               <el-table-column label="维修项目" align="center" width="200">
@@ -472,6 +472,7 @@
                   name="file"
                   :action="updateAction"
                   :limit="10"
+                  :on-preview="handlePreview"
                   :on-success="handleSuccess"
                   :on-remove="handleRemove"
                   :headers="headers"
@@ -1254,7 +1255,15 @@ export default {
         }
       })
     },
-    serviceDelete(index) {
+    serviceDelete(value, index) {
+      if (this.formobj.goodsDetailsVos.length > 0) {
+        for (var i = 0; i < this.formobj.goodsDetailsVos.length; i++) {
+          if (this.formobj.goodsDetailsVos[i].serviceItem === value) {
+            this.$message({ showClose: true, type: 'error', message: '因维修用料表中包含该维修项目,无法删除' })
+            return
+          }
+        }
+      }
       this.formobj.sitemVos.splice(index, 1)
     },
     serviceCurrentChange(value, row) {
@@ -1416,6 +1425,9 @@ export default {
         })
       }
     },
+    handlePreview(file, fileList) {
+      window.open(file.url, '_blank')
+    },
     handleRemove(file, fileList) {
       if (this.formobj.fileName.length > 0) {
         this.formobj.fileName.forEach((e, index) => {
@@ -1671,6 +1683,7 @@ export default {
       }
       this.serviceData = []
       this.subjoinData = []
+      this.fileList = []
       this.activeNames = '1'
       this.submitdisabled = false
       this.$emit('doback')