2023-4-21

src/HDrpManagement/invoiceapp/detail/tab/invoiceOrder/components/addorderline.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button v-if="tool.checkAuth($route.name,'InvioceOrder')" :disabled="status !== '新建'" style="margin-bottom:10px" size="small" type="primary" @click="onShow">添加订单行</el-button>
-    <el-dialog title="可添加订单" append-to-body :visible.sync="dialogTableVisible">
+    <el-dialog title="开票订单行" append-to-body :visible.sync="dialogTableVisible">
       <div class="flex-align-center" style="margin-bottom:16px">
         <el-input size="small"  
           style="width:200px"
@@ -11,7 +11,7 @@
         <uploadAllData
           class="inline-16"
           :total="total"
-          dataType="订单"
+          dataType="订单行"
           @handlePullApi="handlePullApi"
           @handleUploadApi="handleUploadApi"
           @onSuccess="onSuccess"

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

@@ -94,7 +94,8 @@ export default {
         return {
           "sa_serviceorderitemsid": 0, 
           "itemid": item.itemid, 
-          "reason": ''
+          "reason": '',
+          "qty":1
         }
       })
       let res = await this.$api.requested({

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -10,7 +10,7 @@
         idname="sa_workorderid"
         ownertable="sa_workorder"
         tags=""
-        :tabs="['工序详情','确认单','服务团队','工单物料','详细信息']"
+        :tabs="mainData.actiontype == '工序模板' ? ['工序详情','确认单','服务团队','工单物料','详细信息'] : ['服务商品','确认单','服务团队','详细信息']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
@@ -81,7 +81,7 @@
           v-if="mainData.status != '完结' && tool.checkAuth($route.name,'delete')"
         />
       </div>
-      <div slot="slot0" >
+      <div slot="slot0" v-if="mainData.actiontype == '工序模板'">
         <taskDetail :data="nodes">
           <template v-slot:detail="scope">
               <taskListDetail class="inline-16" :data="scope.data"></taskListDetail>
@@ -91,26 +91,48 @@
           </template> -->
         </taskDetail>
       </div>
-      <div slot="slot1" >
+      <div slot="slot1" v-if="mainData.actiontype == '工序模板'">
         <checkBill>
           <template v-slot:download="scope">
             <el-button v-if="tool.checkAuth($route.name,'checkBillDetail')" type="text" size="mini" @click="downLoadBill(scope.data)">单 据 下 载</el-button>
           </template>
         </checkBill>
       </div>
-      <div slot="slot2">
+      <div slot="slot2" v-if="mainData.actiontype == '工序模板'">
         <teamList v-if="tool.checkAuth($route.name,'teamList')" ref="teamList" :data="mainData.team">
           <selectTeam ref="team" @teamChange="teamChange" slot="add">
             <el-button  v-if="tool.checkAuth($route.name,'teamHandle')" class="button-new-tag" size="small" type="primary" @click="$refs.team.dialogFormVisible=true">添 加</el-button>
           </selectTeam>
         </teamList>
       </div>
-      <div slot="slot3">
-        <Items :data="mainData.titems"></Items>
+      <div slot="slot3" v-if="mainData.actiontype == '工序模板'">
+        <Items :data="mainData"></Items>
       </div>
-      <div slot="slot4" >
+      <div slot="slot4" v-if="mainData.actiontype == '工序模板'">
         <detailInfo :more="true" :data="detailInfo"></detailInfo>
       </div>
+
+      <div slot="slot0" v-if="mainData.actiontype != '工序模板'">
+        <Items :data="mainData"></Items>
+      </div>
+      <div slot="slot1" v-if="mainData.actiontype != '工序模板'">
+        <checkBill>
+          <template v-slot:download="scope">
+            <el-button v-if="tool.checkAuth($route.name,'checkBillDetail')" type="text" size="mini" @click="downLoadBill(scope.data)">单 据 下 载</el-button>
+          </template>
+        </checkBill>
+      </div>
+      <div slot="slot2" v-if="mainData.actiontype != '工序模板'">
+        <teamList v-if="tool.checkAuth($route.name,'teamList')" ref="teamList" :data="mainData.team">
+          <selectTeam ref="team" @teamChange="teamChange" slot="add">
+            <el-button  v-if="tool.checkAuth($route.name,'teamHandle')" class="button-new-tag" size="small" type="primary" @click="$refs.team.dialogFormVisible=true">添 加</el-button>
+          </selectTeam>
+        </teamList>
+      </div>
+      <div slot="slot3" v-if="mainData.actiontype != '工序模板'">
+        <detailInfo :more="true" :data="detailInfo"></detailInfo>
+      </div>
+      
     </basicDetails>
   </div>
 </template>
@@ -268,6 +290,10 @@ export default {
         {
           label:'结束时间',
           value:this.mainData.enddate
+        },
+        {
+          label:'操作类型',
+          value:this.mainData.actiontype
         }
       ]
       this.detailInfo = [

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

@@ -17,7 +17,7 @@
     <div style="margin-top: 15px">
       <el-table
           ref="multipleTable"
-          :data="data"
+          :data="data.titems"
           style="width: 100%"
           size="mini"
           height="50vh"
@@ -42,6 +42,21 @@
               prop="qty"
               label="数量">
           </el-table-column>
+          <el-table-column
+              v-if="data.actiontype == '非工序模板'"
+              prop="processing"
+              label="处理方式">
+          </el-table-column>
+          <el-table-column
+            v-if="data.actiontype == '非工序模板'"
+              prop="result"
+              label="处理结果">
+          </el-table-column>
+          <el-table-column
+            v-if="data.actiontype == '非工序模板'"
+              prop="reason"
+              label="原因解析">
+          </el-table-column>
         </el-table>
     </div>
   </div>

src/SDrpManagement/invoiceapp_saler/detail/tab/invoiceOrder/components/addorderline.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button v-if="tool.checkAuth($route.name,'InvioceOrder')" :disabled="status !== '新建'" style="margin-bottom:10px" size="small" type="primary" @click="onShow">添加订单行</el-button>
-    <el-dialog title="可添加订单" append-to-body :visible.sync="dialogTableVisible">
+    <el-dialog title="可添加开票订单行" append-to-body :visible.sync="dialogTableVisible">
       <div class="flex-align-center" style="margin-bottom:16px">
         <el-input size="small"  
           style="width:200px"
@@ -11,7 +11,7 @@
         <uploadAllData
           class="inline-16"
           :total="total"
-          dataType="订单"
+          dataType="订单行"
           @handlePullApi="handlePullApi"
           @handleUploadApi="handleUploadApi"
           @onSuccess="onSuccess"

src/SDrpManagement/sinvoiceapp/detail/tab/invoiceOrder/components/addorderline.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button v-if="tool.checkAuth($route.name,'InvioceOrder')" :disabled="status !== '新建'" style="margin-bottom:10px" size="small" type="primary" @click="onShow">添加订单行</el-button>
-    <el-dialog title="可添加订单" append-to-body :visible.sync="dialogTableVisible">
+    <el-dialog title="可添加开票订单行" append-to-body :visible.sync="dialogTableVisible">
       <div class="flex-align-center" style="margin-bottom:16px">
         <el-input 
           style="width:200px;margin-right: 10px;" 
@@ -13,7 +13,7 @@
         <uploadAllData
           class="inline-16"
           :total="total"
-          dataType="订单"
+          dataType="订单行"
           @handlePullApi="handlePullApi"
           @handleUploadApi="handleUploadApi"
           @onSuccess="onSuccess"