2023-4-21

src/HDrpManagement/serveBill/modules/detail.vue

@@ -60,12 +60,12 @@
           <addProduct v-if="tool.checkAuth($route.name,'serveProduct') && mainData.status == '新建'" slot="addProduct" :data="mainData" @onSuccess="$refs.product.listData()" />
           <template v-slot:editProduct="scope">
             <el-button class="inline-16" v-if="tool.checkAuth($route.name,'serveProduct') && mainData.status == '新建'" type="text" size="mini" @click="$refs.product.currentProduct=scope.data">编 辑</el-button>            
-            <!-- <el-button class="inline-16" v-if="mainData.status == '新建'" type="text" size="mini" @click="$refs.product.currentProduct=scope.data">编 辑</el-button>             -->
           </template>
           <template v-slot:delProduct="scope">
             <delete-btn nameId="20230206162003" v-if="tool.checkAuth($route.name,'serveProduct') && mainData.status == '新建'" nameKey="sa_serviceorderitemsids" :id="scope.data.sa_serviceorderitemsid" @deleteSuccess="$refs.product.listData()"></delete-btn>
           </template>
         </productTable>
+        
       </div>
     </basicDetails>
   </div>

src/HDrpManagement/serveBill/modules/product/index.vue

@@ -25,7 +25,10 @@
             <div v-else>{{scope.column.data.reason ? scope.column.data.reason : '--'}}</div>
           </div>
           <div v-else-if="scope.column.columnname == 'qty'">
-            <el-input type="text" size="mini" v-model="scope.column.data.qty"></el-input>
+            <div v-if="currentProduct.sa_serviceorderitemsid == scope.column.data.sa_serviceorderitemsid">
+              <el-input type="text" size="mini" v-model="scope.column.data.qty"></el-input>
+            </div>
+            <div v-else>{{scope.column.data.qty ? scope.column.data.qty : '--'}}</div>
           </div>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           <p v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] !== 0 && scope.column.columnname != 'operation'&& scope.column.columnname != 'reason'">--</p>
@@ -90,7 +93,8 @@ export default {
                 {
                   "sa_serviceorderitemsid": data.sa_serviceorderitemsid, 
                   "itemid": data.itemid, 
-                  "reason": data.reason
+                  "reason": data.reason,
+                  qty:data.qty
                 }
             ]
 

src/HDrpManagement/serveWorkBill/modules/checkBill/index.vue

@@ -22,7 +22,6 @@
         </template>
         <template v-slot:opreation="scope">
           <slot name="download" :data="scope.data"></slot>
-          <el-button type="text" size="mini" @click="compile(scope.data)">单据生成</el-button>
         </template>
       </tableLayout>
     </div>

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -162,11 +162,12 @@ export default {
             
     },
     downLoadBill (data) {
-      if(data.attinfos.length == 0) return this.$message({
+      let result = data.attinfos.filter(item => item.usetype == "signature")
+      if(result.length == 0) return this.$message({
         type:'warning',
         message:'暂无单据信息'
       })      
-      window.open(data.attinfos[0].url,'_self')
+      window.open(result[0].url,'_self')
     },
     async teamChange (data) {
       let result = data.map(item => {

src/HDrpManagement/toolBorrowingMag/modules/check.vue

@@ -22,6 +22,14 @@
     </el-popover>
 
     <el-dialog title="选择押金单号" :visible.sync="visible2" append-to-body width="1000px">
+      <el-input 
+          style="width:200px;margin-bottom:10px" 
+          size="small"  
+          suffix-icon="el-icon-search" 
+          placeholder="搜索" 
+          v-model="param.content.keywords"
+          @keyup.enter.native="listData(param.content.pageNumber = 1)" 
+          @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
       <el-table
         :header-cell-style="{background:'#EEEEEE',color:'#333'}" 
         size="mini"

src/HDrpManagement/workBillModule/components/add.vue

@@ -19,6 +19,14 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="操作类型" prop="actiontype">
+              <el-select v-model="form.actiontype">
+                <el-option label="工序模板" value="工序模板"></el-option>
+                <el-option label="非工序模板" value="非工序模板"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
       <div class="dialog-footer">
@@ -39,14 +47,18 @@ export default {
       form:{
         "sa_workorder_templateid":0,     //sa_brandid<=0时 为新增
         "name":"",
-        "type":""
+        "type":"",
+        "actiontype":''
       },
       rules:{
         name:[
           { required: true, message: '请输入模板名称', trigger: 'blur'},
         ],
         type:[
-          { required: true, message: '输入账户名称', trigger: 'blur'}
+          { required: true, message: '选择模板类型', trigger: 'change'}
+        ],
+        actiontype:[
+          { required: true, message: '选择操作类型', trigger: 'change'}
         ]
       }
     }

src/HDrpManagement/workBillModule/components/edit.vue

@@ -19,6 +19,14 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="操作类型" prop="actiontype">
+              <el-select v-model="form.actiontype">
+                <el-option label="工序模板" value="工序模板"></el-option>
+                <el-option label="非工序模板" value="非工序模板"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
       <div class="dialog-footer">
@@ -39,8 +47,9 @@ export default {
       serveTypeList:[],
       form:{
         "sa_workorder_templateid":0,     //sa_brandid<=0时 为新增
-        "name":"培训工单",
-        "type":"安装培训"
+        "name":"",
+        "type":"",
+        "actiontype":''
       },
       rules:{
         name:[
@@ -48,6 +57,9 @@ export default {
         ],
         type:[
           { required: true, message: '输入账户名称', trigger: 'blur'}
+        ],
+        actiontype:[
+          { required: true, message: '选择操作类型', trigger: 'change'}
         ]
       }
     }

src/HDrpManagement/workBillModule/modules/detail.vue

@@ -11,7 +11,7 @@
         ownertable="sa_workorder_template"
         :delApiId="20230207140803"
         tags=""
-        :tabs="['工作明细','详细信息']"
+        :tabs="tabs"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
@@ -41,10 +41,10 @@
         />
       </div>
       <div slot="slot0" >
-        <taskDetail>
+        <taskDetail v-if="mainData.actiontype == '工序模板'">
         </taskDetail>
       </div>
-      <div slot="slot1" >
+      <div :slot="mainData.actiontype == '工序模板' ? 'slot1' : 'slot0'" >
         <detailInfo :more="true" :data="detailInfo"></detailInfo>
       </div>
     </basicDetails>
@@ -60,7 +60,8 @@ export default {
     return {
       mainData:{},
       mainAreaData:{},
-      detailInfo:''
+      detailInfo:'',
+      tabs:['详细信息']
     }
   },
   components:{
@@ -83,6 +84,7 @@ export default {
       })
       this.mainData = res.data
       this.changeDataStructure()
+      if (this.mainData.actiontype == '工序模板') this.tabs.unshift('工序明细')
       console.log(this.mainData);
       
     },
@@ -100,6 +102,11 @@ export default {
           label:'是否启用',
           value:this.mainData.isused ? '是' : '否'
         },
+        {
+          label:'操作类型',
+          value:this.mainData.actiontype
+        }
+        
       ]
       this.detailInfo = [
         {